diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 23:00:45 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 23:00:45 +0100 |
| commit | 3cc1f8a1eb2986db05de6dd25c0869921dc41136 (patch) | |
| tree | 0645a44275cea5928b9f2d52b591a9d09969032c /bcm4329/dhdutil/NOTICE | |
| parent | 6863a0b90384a0fcb2d6280923e942242293f1c0 (diff) | |
| parent | 82f1cb8a08a90ff145e0a4eebede9c6a1ba2be95 (diff) | |
| download | android_hardware_broadcom_wlan-stable/cm-10.2.tar.gz android_hardware_broadcom_wlan-stable/cm-10.2.tar.bz2 android_hardware_broadcom_wlan-stable/cm-10.2.zip | |
Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2
Android 4.3 release 2.1
Conflicts:
bcm4329/Android.mk
bcmdhd/config/config-bcm.mk
Change-Id: Ib265fc14466dc52c40db6e2b457dbba84992fb2f
Diffstat (limited to 'bcm4329/dhdutil/NOTICE')
| -rw-r--r-- | bcm4329/dhdutil/NOTICE | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/bcm4329/dhdutil/NOTICE b/bcm4329/dhdutil/NOTICE deleted file mode 100644 index 6b0eb47..0000000 --- a/bcm4329/dhdutil/NOTICE +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 1999-2011, Broadcom Corporation - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |