From: Hugo Benichi <hugobenichi@google.com>
Date: Tue, 4 Jul 2017 09:49:00 +0000 (+0000)
Subject: Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 4148fe64b9
X-Git-Tag: android-x86-9.0-r1~1029^2^2~141
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2a7985a6d0;p=android-x86%2Fframeworks-base.git

Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 4148fe64b9
am: 1005e82639

Change-Id: I0043c4a4c96f7ee39b9036060897dbf85222c6e6
---

2a7985a6d0c3b554f8cd5f178034ea66d62606e0