OSDN Git Service

Merge "Add POSIX getsubopt(3)."
authorElliott Hughes <enh@google.com>
Tue, 5 Apr 2016 18:03:56 +0000 (18:03 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 5 Apr 2016 18:03:56 +0000 (18:03 +0000)
1  2 
libc/Android.mk
libc/libc.arm.brillo.map
libc/libc.arm.map
libc/libc.arm64.map
libc/libc.map.txt
libc/libc.mips.brillo.map
libc/libc.mips.map
libc/libc.mips64.map
libc/libc.x86.brillo.map
libc/libc.x86.map
libc/libc.x86_64.map

diff --cc libc/Android.mk
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge