OSDN Git Service

Merge "IpManagerTest: fix flaky test for real"
authorHugo Benichi <hugobenichi@google.com>
Fri, 21 Jul 2017 08:15:20 +0000 (08:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Jul 2017 08:15:20 +0000 (08:15 +0000)
am: e0a743d035

Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41


Trivial merge