OSDN Git Service

Merge "ConnectivityServiceTest: fix flakyness" am: a82cac1452
authorHugo Benichi <hugobenichi@google.com>
Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)
am: 004f36d5bc

Change-Id: Id8468bd8e38927341cdbebe2925c0bfd4bb37c0c


Trivial merge