diff options
author | Chris Banes <chrisbanes@google.com> | 2015-05-15 17:04:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-15 17:04:48 +0000 |
commit | d9f89c5ddf9da933b230e86fa3fa29477dc47b4b (patch) | |
tree | 3877c6957b548a32823c5a06bfb6212763395b04 | |
parent | 9d4d0643d6c19d79d5035a2b5ab77bc632ba2dda (diff) | |
parent | f8d945a26071eeff5a8680a028c1ade93fb215ae (diff) | |
download | glide-d9f89c5ddf9da933b230e86fa3fa29477dc47b4b.tar.gz |
Merge branch 'mnc-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev
-rw-r--r-- | MODULE_LICENSE_BSD | 0 | ||||
-rw-r--r-- | NOTICE | 25 |
2 files changed, 25 insertions, 0 deletions
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/MODULE_LICENSE_BSD @@ -0,0 +1,25 @@ +Copyright 2014 Google, Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are +permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + + 2. 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 GOOGLE, INC. ``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 GOOGLE, INC. 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 SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those of the +authors and should not be interpreted as representing official policies, either expressed +or implied, of Google, Inc. |