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)
am: 02075d2100

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


Trivial merge