diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-04-02 14:40:07 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-04-02 14:40:07 -0700 |
| commit | 4ff253ffd0b4d29c770af1c877b434523e18ca50 (patch) | |
| tree | 304d4ea39e592956b5d098ba801ce30ad459576a | |
| parent | 76cacb1f69d1999bb244eb3665fb2e7dbfe2a81f (diff) | |
| download | android_dalvik-4ff253ffd0b4d29c770af1c877b434523e18ca50.tar.gz android_dalvik-4ff253ffd0b4d29c770af1c877b434523e18ca50.tar.bz2 android_dalvik-4ff253ffd0b4d29c770af1c877b434523e18ca50.zip | |
Remove JSON License from NOTICE file
Change-Id: Ie4426f8e33ddef42916e88adeaf672714212d3a3
| -rw-r--r-- | libcore/NOTICE | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/libcore/NOTICE b/libcore/NOTICE index f51da455a..39a4ea2e5 100644 --- a/libcore/NOTICE +++ b/libcore/NOTICE @@ -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. == ========================================================================= |