Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2abd8c4 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Mass merge from gingerbread - do not merge 

Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
parents 3c89f6d1 43abedde

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/7.xml 7 \

    -since ./frameworks/base/api/8.xml 8 \

    -since ./frameworks/base/api/9.xml 9 \

    -since ./frameworks/base/api/10.xml 10 \

    -since ./frameworks/base/api/current.xml Honeycomb \

		-werror -hide 113 \

		-overview $(LOCAL_PATH)/core/java/overview.html

NOTICE

+10 −0
Original line number Diff line number Diff line
@@ -51,6 +51,16 @@ the Apache2 License. 


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.



   =========================================================================