summaryrefslogtreecommitdiffstats
path: root/NOTICE
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-04-02 14:40:07 -0700
committerBrian Carlstrom <bdc@google.com>2010-04-02 14:40:07 -0700
commitf83edd871f1cfbdf858ca853543ee39d095a6e12 (patch)
tree8b77ca3c48646f868a027f85394e8fd023e6c656 /NOTICE
parent32d82ccbb3ca7a9a0ffd050db4d246e936f25af7 (diff)
downloadlibcore-f83edd871f1cfbdf858ca853543ee39d095a6e12.zip
libcore-f83edd871f1cfbdf858ca853543ee39d095a6e12.tar.gz
libcore-f83edd871f1cfbdf858ca853543ee39d095a6e12.tar.bz2
Remove JSON License from NOTICE file
Change-Id: Ie4426f8e33ddef42916e88adeaf672714212d3a3
Diffstat (limited to 'NOTICE')
-rw-r--r--NOTICE28
1 files changed, 0 insertions, 28 deletions
diff --git a/NOTICE b/NOTICE
index f51da45..39a4ea2 100644
--- a/NOTICE
+++ b/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. ==
=========================================================================