Skip to content
Browse files

resolved conflicts for merge of adee6b3 to honeycomb-plus-aosp

Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b
  • Loading branch information...
2 parents dc494e1 + adee6b3 commit 2b30e051b625df4b08ee520cd86c23919a9622f1 Eric Laurent committed Jan 17, 2011
Showing with 12 additions and 0 deletions.
  1. +12 −0 NOTICE
View
12 NOTICE
@@ -82,6 +82,18 @@ Additional Codecs
These files are Copyright 2003-2010 VisualOn, 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 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
http://www.apache.org/licenses/

0 comments on commit 2b30e05

Please sign in to comment.
Something went wrong with that request. Please try again.