diff options
| author | Elliott Hughes <enh@google.com> | 2017-07-05 15:51:44 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-07-05 16:03:59 -0700 |
| commit | 02a3fe9fc6b5197f5b57487f1f735fb7136347ec (patch) | |
| tree | ad489a68f007065803f2e86112488c1a329eeefa /libc/NOTICE | |
| parent | f45bc14d5497c30bd43e22d025e3b88812b2baa4 (diff) | |
| download | android_bionic-02a3fe9fc6b5197f5b57487f1f735fb7136347ec.tar.gz android_bionic-02a3fe9fc6b5197f5b57487f1f735fb7136347ec.tar.bz2 android_bionic-02a3fe9fc6b5197f5b57487f1f735fb7136347ec.zip | |
Update <arpa/*> from FreeBSD.
We've had <arpa/telnet.h> for years, despite being slightly more useless
than <arpa/ftp.h> and <arpa/tftp.h>. The inetutils package expects these
to be available.
Bug: http://b/63145226
Test: builds
Change-Id: I1e3c7421779e965b3342d681fefb8dc2561b604d
Diffstat (limited to 'libc/NOTICE')
| -rw-r--r-- | libc/NOTICE | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/libc/NOTICE b/libc/NOTICE index 82df90a9f..c74811c32 100644 --- a/libc/NOTICE +++ b/libc/NOTICE @@ -1267,35 +1267,6 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (c) 1983, 1993 - The Regents of the University of California. 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. -4. Neither the name of the University 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 THE REGENTS 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 REGENTS 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. - -------------------------------------------------------------------- - Copyright (c) 1985 The Regents of the University of California. All rights reserved. |