From 20dda290edd481880682bdc9ac9d1aa4ef6410b6 Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Thu, 18 Mar 2010 16:26:56 -0700 Subject: Correct the NOTICE Change-Id: Ia0a80a5cc9d7239266484ac38865df0c89e51f84 --- NOTICE | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/NOTICE b/NOTICE index 3ca81a1..e4fd53f 100644 --- a/NOTICE +++ b/NOTICE @@ -1,9 +1,10 @@ -Copyright 2010, The Android Open Source Project +Copyright (C) 2002-2009, Xiph.org Foundation +Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +modification, are permitted provided that the following conditions +are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. @@ -11,9 +12,10 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the Android Open Source Project nor the -names of its contributors may be used to endorse or promote products -derived from this software without specific prior written permission. + * Neither the names of the Xiph.org Foundation nor Pinknoise +Productions Ltd nor the names of its contributors may be used to +endorse or promote products derived from this software without +specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- cgit v1.1