summaryrefslogtreecommitdiffstats
path: root/NOTICE
diff options
context:
space:
mode:
authorDan Morrill <morrildl@google.com>2011-01-13 10:19:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-13 10:19:29 -0800
commitc506ab89505f7adf5411f2418e48ea67acf03700 (patch)
tree49f98a9edee1b556c78ffaa90fffb39600fdd76e /NOTICE
parent18adceb4273655b6cf8eaa9c6a2237d6fc1b8881 (diff)
parent4330b1464d26fa693b61d496092e10ce0419ee3d (diff)
downloadframeworks_base-c506ab89505f7adf5411f2418e48ea67acf03700.zip
frameworks_base-c506ab89505f7adf5411f2418e48ea67acf03700.tar.gz
frameworks_base-c506ab89505f7adf5411f2418e48ea67acf03700.tar.bz2
am 4330b146: Adding ASL2 attribution for VisualOn.
* commit '4330b1464d26fa693b61d496092e10ce0419ee3d': Adding ASL2 attribution for VisualOn.
Diffstat (limited to 'NOTICE')
-rw-r--r--NOTICE10
1 files changed, 10 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE
index 2006201..5560999 100644
--- a/NOTICE
+++ b/NOTICE
@@ -53,6 +53,16 @@ Media Codecs
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/