diff options
| author | 2010-05-06 16:12:33 -0700 | |
|---|---|---|
| committer | 2010-05-06 16:12:33 -0700 | |
| commit | 60b02cab9cba74e4fe1fcbe64af85ed867d20cf9 (patch) | |
| tree | 0da47134076ed64854af186b80ecb6e9083e1d85 | |
| parent | ad0830a136e1a205be42f18c4b779e50c9ac1985 (diff) | |
| parent | 6199375773a8b3c8eebec17ffc1bce2ee7169d57 (diff) | |
am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp
* commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57':
Adding PacketVideo attribution in NOTICE.
| -rw-r--r-- | NOTICE | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -43,6 +43,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 Version 2.0, January 2004 http://www.apache.org/licenses/ |