OSDN Git Service

Merge "Fix ifaddrs#getifaddrs_INET flakiness." am: a279324094
authorElliott Hughes <enh@google.com>
Wed, 3 Feb 2016 19:02:48 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Feb 2016 19:02:48 +0000 (19:02 +0000)
commit24c9dfd222c5d51ecd7e11d2e260ca25b906eddc
tree83081f80ef1b38efcadf8de833bf005d5a674421
parentb159f13918acb247ec08515b68fe4f5e9feb979a
parent02075d2100686edd059efe0ac6dc8f3eb7f439bd
Merge "Fix ifaddrs#getifaddrs_INET flakiness." am: a279324094
am: 02075d2100

* commit '02075d2100686edd059efe0ac6dc8f3eb7f439bd':
  Fix ifaddrs#getifaddrs_INET flakiness.