tree d8a5377407eeb61b18741b80aa7c16840fc744b9
parent cf897fad83852c89c9dcec679c332c64b812dc2a
parent 6b480eca3f80a2ff790a82eb2d3c779a527af263
author Hugo Benichi <hugobenichi@google.com> 1482172927 +0000
committer android-build-merger <android-build-merger@google.com> 1482172927 +0000

DO NOT MERGE Fix IP connectivity metrics tests am: 93c0de0a35
am: 6b480eca3f  -s ours

Change-Id: I5ccac93d3815a7ad967fa1494d6e48220beaf88b