diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-04-02 15:59:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 15:59:31 -0700 |
| commit | 10163e3aee5c4125b7cb3d753f523ade326e06f5 (patch) | |
| tree | 1e7793f58b106e4bff79c96468c09ec929174a62 /NOTICE | |
| parent | c96413500886e0c8909eabb006c1872ff2f7ea5b (diff) | |
| parent | cb4908ae95794de1c3fc83a74caf8c8c45b41da5 (diff) | |
| download | libcore-10163e3aee5c4125b7cb3d753f523ade326e06f5.zip libcore-10163e3aee5c4125b7cb3d753f523ade326e06f5.tar.gz libcore-10163e3aee5c4125b7cb3d753f523ade326e06f5.tar.bz2 | |
am 85948576: am 4ff253ff: Remove JSON License from NOTICE file
Merge commit '85948576f0270265ebeca795f41447ad4f549c11' into dalvik-dev
* commit '85948576f0270265ebeca795f41447ad4f549c11':
Remove JSON License from NOTICE file
Diffstat (limited to 'NOTICE')
| -rw-r--r-- | NOTICE | 28 |
1 files changed, 0 insertions, 28 deletions
@@ -93,34 +93,6 @@ property of their respective owners. ========================================================================= - == NOTICE file for the JSON License. == - ========================================================================= - -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - ========================================================================= == NOTICE file for the JUnit License. == ========================================================================= |