diff options
| author | David Deephanphongs <dpanpong@google.com> | 2010-10-19 14:54:05 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-19 16:56:02 -0700 |
| commit | 62f2ada64f7213243eafd7a4a4c3ccd5040ad85a (patch) | |
| tree | 89da1077376b3f28e2cc680ef4d0ca54a2431e24 /NOTICE | |
| parent | 99291b95b2ee1e1b2371806e6f6c96767a350c88 (diff) | |
| download | frameworks_base-62f2ada64f7213243eafd7a4a4c3ccd5040ad85a.zip frameworks_base-62f2ada64f7213243eafd7a4a4c3ccd5040ad85a.tar.gz frameworks_base-62f2ada64f7213243eafd7a4a4c3ccd5040ad85a.tar.bz2 | |
Add missing NOTICE entries.
Add missing NOTICE block for TagSoup in general NOTICE file.
Add comment in Android.mk to help reviewers locate the NOTICE for apache-http.
Modify build rule for 'am' command to pull in the NOTICE file.
Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
Diffstat (limited to 'NOTICE')
| -rw-r--r-- | NOTICE | 22 |
1 files changed, 21 insertions, 1 deletions
@@ -17,7 +17,7 @@ The Android Open Source Project (http://source.android.com). ========================================================================= Apache Commons -Copyright 1999-2004 The Apache Software Foundation +Copyright 1999-2006 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -53,6 +53,26 @@ 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 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. + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ |