summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-01-13 16:07:00 -0800
committerEric Laurent <elaurent@google.com>2011-01-17 12:50:15 -0800
commited2d6b78f6b57c233ca6d3dc3f5803a2a3971c4a (patch)
tree06dc9ba7bf3fa189d5bd795cb9b2ba9c3f223a32
parentec7c9ff0bb1c98cb8bec3ec7bdacbae3a434fa53 (diff)
downloadframeworks_base-ed2d6b78f6b57c233ca6d3dc3f5803a2a3971c4a.zip
frameworks_base-ed2d6b78f6b57c233ca6d3dc3f5803a2a3971c4a.tar.gz
frameworks_base-ed2d6b78f6b57c233ca6d3dc3f5803a2a3971c4a.tar.bz2
Fix omission in NOTICE file.
Added copyright notice for audio effects source files under media/libeffects/lvm. Change-Id: I5ac961000f7bbbfa1f95523712d8517844b1e5f9
-rw-r--r--NOTICE11
1 files changed, 11 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE
index 8d6f583..d857ba3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -72,6 +72,17 @@ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied; not even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Audio Effects code. ==
+ =========================================================================
+
+Audio Effects
+These files are Copyright (C) 2004-2010 NXP Software and
+Copyright (C) 2010 The Android Open Source Project, but released under
+the Apache2 License.
+
Apache License
Version 2.0, January 2004