Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo

Browse Source 
Merge commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp

* commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57':
  Adding PacketVideo attribution in NOTICE.
This commit is contained in:
Dan Morrill
2010-05-06 16:12:33 -07:00
committed by Android Git Automerger
parent ad0830a136 6199375773
commit 60b02cab9c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NOTICE
View File

@@ -41,6 +41,16 @@ The Apache Software Foundation (http://www.apache.org/).
=========================================================================
These files are Copyright 2007 Nuance Communications, 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 Media Codecs code. ==
=========================================================================
Media Codecs
These files are Copyright 1998 - 2009 PacketVideo, but released under
the Apache2 License.
Apache License