| Index: third_party/robolectric/licenses/javolution.license.txt
|
| diff --git a/base/third_party/superfasthash/LICENSE b/third_party/robolectric/licenses/javolution.license.txt
|
| similarity index 54%
|
| copy from base/third_party/superfasthash/LICENSE
|
| copy to third_party/robolectric/licenses/javolution.license.txt
|
| index 3c40a3ecd791a2137e466ffd216e9813d0e98e90..0633749e4adf870eef1e7c7d7eebfd64cad26c37 100644
|
| --- a/base/third_party/superfasthash/LICENSE
|
| +++ b/third_party/robolectric/licenses/javolution.license.txt
|
| @@ -1,27 +1,23 @@
|
| -Paul Hsieh OLD BSD license
|
| -
|
| -Copyright (c) 2010, Paul Hsieh
|
| +Javolution - Java(TM) Solution for Real-Time and Embedded Systems
|
| +Copyright (c) 2006, Javolution (http://javolution.org)
|
| All rights reserved.
|
|
|
| Redistribution and use in source and binary forms, with or without modification,
|
| are permitted provided that the following conditions are met:
|
|
|
| -* Redistributions of source code must retain the above copyright notice, this
|
| - list of conditions and the following disclaimer.
|
| -* Redistributions in binary form must reproduce the above copyright notice, this
|
| - list of conditions and the following disclaimer in the documentation and/or
|
| - other materials provided with the distribution.
|
| -* Neither my name, Paul Hsieh, nor the names of any other contributors to the
|
| - code use may not be used to endorse or promote products derived from this
|
| - software without specific prior written permission.
|
| + * Redistributions of source code must retain the above copyright notice,
|
| + this list of conditions and the following disclaimer.
|
| + * Redistributions in binary form must reproduce the above copyright notice,
|
| + this list of conditions and the following disclaimer in the documentation
|
| + and/or other materials provided with the distribution.
|
|
|
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
| -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
| -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
| -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
| +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
| +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
| +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
| -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
| +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|