diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-08 16:20:08 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-04-08 16:20:30 -0700 |
| commit | 82aecc59db32b8f35d837d9fa5719b30515a2847 (patch) | |
| tree | 6c595f38c9af58756016f760d876d8f2a28b48d9 /emulator | |
| parent | dbe32daf2f98a6a44b4ae80e2ffa6ceb86f9c7e2 (diff) | |
| parent | ac811fa64c89e3dc29f4ba8240e451ba732f6842 (diff) | |
| download | sdk-82aecc59db32b8f35d837d9fa5719b30515a2847.zip sdk-82aecc59db32b8f35d837d9fa5719b30515a2847.tar.gz sdk-82aecc59db32b8f35d837d9fa5719b30515a2847.tar.bz2 | |
merge from tools-r6
Change-Id: If11d893ba56c1189620e00f86b7f51bf4d698e49
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/mksdcard/MODULE_LICENSE_BSD | 0 | ||||
| -rw-r--r-- | emulator/mksdcard/NOTICE | 23 |
2 files changed, 23 insertions, 0 deletions
diff --git a/emulator/mksdcard/MODULE_LICENSE_BSD b/emulator/mksdcard/MODULE_LICENSE_BSD new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/emulator/mksdcard/MODULE_LICENSE_BSD diff --git a/emulator/mksdcard/NOTICE b/emulator/mksdcard/NOTICE new file mode 100644 index 0000000..e4f5db9 --- /dev/null +++ b/emulator/mksdcard/NOTICE @@ -0,0 +1,23 @@ +Copyright 2007, The Android Open Source Project + +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 the name of Google Inc. nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +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. 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. |