| commit | 19add4118ff37920fd025ab8ad1245a7ef6c6524 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:26:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:26:08 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 85cf8eb559910030b68e4413dbe3aa21dccf38fb [diff] | |
| parent | bc78eb9db7ea98c04561ccfc7150cf688d5ed3c6 [diff] |
am c826b5b0: am cb599d34: (-s ours) am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo." * commit 'c826b5b0643df03ae3607fcb0954869bf09466a7':