OSDN Git Service

Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1e3624527b...
authorRoland Levillain <rpl@google.com>
Tue, 4 Jul 2017 11:47:35 +0000 (11:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 11:47:35 +0000 (11:47 +0000)
am: d5e3d66e07

Change-Id: I3d7c4b4752143983bc67f72120883d45925129f7


Trivial merge