OSDN Git Service

Merge "Add a netcontext variant of gethostbyaddr" am: 4767bc4a6c am: 6968edc290
authorBen Schwartz <bemasc@google.com>
Mon, 22 May 2017 10:24:42 +0000 (10:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 10:24:42 +0000 (10:24 +0000)
am: e6a3acecd8

Change-Id: Ifdee34b6d68cba16dad3133cb8fe5b40ba81d837


Trivial merge