resolved conflicts for merge of 4330b146 to honeycomb-merge

Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a

diff --cc NOTICE
index d857ba3,5560999..1c93e9f
--- 1/NOTICE
--- 2/NOTICE
+++ b/NOTICE
@@@ -56,34 -56,13 +56,43 @@@ 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.
+ 
++   =========================================================================
++   ==  NOTICE file corresponding to the section 4 d of                    ==
++   ==  the Apache License, Version 2.0,                                   ==
 +   ==  in this case for the TagSoup code.                                 ==
 +   =========================================================================
 +
 +This file is part of TagSoup and is Copyright 2002-2008 by John Cowan.
 +
 +TagSoup is licensed under the Apache License,
 +Version 2.0.  You may obtain a copy of this license at
 +http://www.apache.org/licenses/LICENSE-2.0 .  You may also have
 +additional legal rights not granted by this license.
 +
 +TagSoup is distributed in the hope that it will be useful, but
 +unless required by applicable law or agreed to in writing, TagSoup
 +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
                          http://www.apache.org/licenses/