OSDN Git Service

Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am: 1211941aa0
authorHugo Benichi <hugobenichi@google.com>
Mon, 2 Oct 2017 10:44:51 +0000 (10:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Oct 2017 10:44:51 +0000 (10:44 +0000)
am: 0d506fc4f4

Change-Id: I630392c4c7dbfd52bf3378f9435cf0cb5b328f6a


Trivial merge