tree f14795d957367aa08c09145cc4039cb6f074eb9f
parent 2a7985a6d0c3b554f8cd5f178034ea66d62606e0
parent 962f1842cabaeafa87a1f44ea9f13dadb60427b1
author Roland Levillain <rpl@google.com> 1499167883 +0000
committer android-build-merger <android-build-merger@google.com> 1499167883 +0000

Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1e3624527b
am: 962f1842ca

Change-Id: I3e1c31d878b8f2899a3ff8b88ab565eb7856d477