commit b1f1d0ede6b54250970525646f25f4c74dcff02c
author James Dong <jdong@google.com> Fri Jan 14 16:27:48 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 14 16:27:48 2011 -0800
tree b7af549de036a18dfd20882c6564b752daf1288b
parent 824bb889ff6cbaae59d067c850956e4e3a46e839
parent 2ee9a92f6a941f010d8f85cd8baee708cd6f2e16

Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread

NOTICE

diff --git a/NOTICE b/NOTICE
index 2006201..5560999 100644
--- a/NOTICE
+++ b/NOTICE
@@ -53,6 +53,16 @@
 These files are Copyright 1998 - 2009 PacketVideo, but released under
 the Apache2 License.
 
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for Additional Codecs code.                           ==
+   =========================================================================
+
+Additional Codecs
+These files are Copyright 2003-2010 VisualOn, but released under
+the Apache2 License.
+
                                Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/