tree d11b2a71d4c049d586a5019e451dc81264940267
parent 8e23b44e57797eed31532c356feb9c915d8858ca
parent 6968edc29070254f3d1bf7833b91673379425cb2
author Ben Schwartz <bemasc@google.com> 1495448381 +0000
committer android-build-merger <android-build-merger@google.com> 1495448381 +0000

Merge "Add a netcontext variant of gethostbyaddr" am: 4767bc4a6c
am: 6968edc290

Change-Id: I52b0f0f965c3f2243f73556271205a20c3062d34