OSDN Git Service

Merge "DO NOT MERGE IP connectivity metrics: fix tests."
authorHugo Benichi <hugobenichi@google.com>
Mon, 10 Apr 2017 05:43:43 +0000 (05:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 05:43:43 +0000 (05:43 +0000)
am: b2adaad26b  -s ours

Change-Id: I47dbd0feaa99ff6018efc8703cfa29a265bc73fd


Trivial merge