tree 83081f80ef1b38efcadf8de833bf005d5a674421
parent b159f13918acb247ec08515b68fe4f5e9feb979a
parent 02075d2100686edd059efe0ac6dc8f3eb7f439bd
author Elliott Hughes <enh@google.com> 1454526168 +0000
committer android-build-merger <android-build-merger@google.com> 1454526168 +0000

Merge "Fix ifaddrs#getifaddrs_INET flakiness." am: a279324094
am: 02075d2100

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