Merge "Add a netcontext variant of gethostbyaddr"

author Treehugger Robot <treehugger-gerrit@google.com>

Mon, 22 May 2017 10:06:29 +0000 (10:06 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 22 May 2017 10:06:31 +0000 (10:06 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Mon, 22 May 2017 10:06:29 +0000 (10:06 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 22 May 2017 10:06:31 +0000 (10:06 +0000)
diff --cc libc/libc.arm.map
Simple merge
diff --cc libc/libc.arm64.map
Simple merge
diff --cc libc/libc.mips.map
Simple merge
diff --cc libc/libc.mips64.map
Simple merge
diff --cc libc/libc.x86.map
Simple merge
diff --cc libc/libc.x86_64.map
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Mon, 22 May 2017 10:06:29 +0000 (10:06 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 22 May 2017 10:06:31 +0000 (10:06 +0000)
		1	2
libc/libc.arm.map	patch \|	diff1 \|	diff2 \|	blob \| history
libc/libc.arm64.map	patch \|	diff1 \|	diff2 \|	blob \| history
libc/libc.mips.map	patch \|	diff1 \|	diff2 \|	blob \| history
libc/libc.mips64.map	patch \|	diff1 \|	diff2 \|	blob \| history
libc/libc.x86.map	patch \|	diff1 \|	diff2 \|	blob \| history
libc/libc.x86_64.map	patch \|	diff1 \|	diff2 \|	blob \| history