| commit | 441972f5240c36079aa2ce152cccd1f63d0cc10d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:28:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:36 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | acf2b75bbcaad0b910e80e542ca8a96ee1855a80 [diff] | |
| parent | f4faf61a59eea9e12a55ffada3e40197fc767023 [diff] |
am fa6cfef5: am 5937a860: (-s ours) am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly." * commit 'fa6cfef507ce7604737ec397cae06697185479dd':