OSDN Git Service

Merge "Fix ifaddrs#getifaddrs_INET flakiness."
authorElliott Hughes <enh@google.com>
Wed, 3 Feb 2016 19:00:11 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Feb 2016 19:00:11 +0000 (19:00 +0000)
commit02075d2100686edd059efe0ac6dc8f3eb7f439bd
tree7d8fb40c64c4d5c5cb33ec4d781c51a5b3dd1af9
parente74d1d6507a28c56941d95889219e1ea24b0ac5c
parenta279324094d748b97201412b2457d2f6e26287dd
Merge "Fix ifaddrs#getifaddrs_INET flakiness."
am: a279324094

* commit 'a279324094d748b97201412b2457d2f6e26287dd':
  Fix ifaddrs#getifaddrs_INET flakiness.