| commit | f4faf61a59eea9e12a55ffada3e40197fc767023 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:43:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:43:46 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 1d40d49e0bd9f38adc17f7d1afda76b0025ba3ea [diff] | |
| parent | 2c98030b713fd9492b336b39a474f4581a1c37cd [diff] |
am 5937a860: (-s ours) am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly." * commit '5937a860f3ad87138956116b9cb0ffbac703c547':