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

Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b

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/