am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."

* commit 'cb599d34b94d638d8fca6aee267e006e7d68d663':
This commit is contained in:
Elliott Hughes 2015-08-27 11:40:00 +00:00 committed by Android Git Automerger
commit c826b5b064

Diff content is not available