diff options
| author | Alex Cheung <alexcheung@google.com> | 2015-05-15 17:05:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-15 17:05:01 +0000 |
| commit | b4b82b7eca1c854469ff2e0e666f7418d946d4b0 (patch) | |
| tree | d79c9b551d9834127c52e4388e0de2f05915e37e | |
| parent | d9f89c5ddf9da933b230e86fa3fa29477dc47b4b (diff) | |
| parent | ac008b7995cd6956fc466f873ee2d810779a1e9b (diff) | |
| download | glide-b4b82b7eca1c854469ff2e0e666f7418d946d4b0.tar.gz | |
am ac008b79: keep history after reset to ub-camera-haleakala
* commit 'ac008b7995cd6956fc466f873ee2d810779a1e9b':
| -rw-r--r-- | MODULE_LICENSE_BSD | 0 | ||||
| -rw-r--r-- | NOTICE | 25 |
2 files changed, 0 insertions, 25 deletions
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD deleted file mode 100644 index e69de29b..00000000 --- a/MODULE_LICENSE_BSD +++ /dev/null diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 65441412..00000000 --- a/NOTICE +++ /dev/null @@ -1,25 +0,0 @@ -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. |