OSDN Git Service

Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203 am: 8fea8e5bbd
authorLorenzo Colitti <lorenzo@google.com>
Fri, 27 Jan 2017 10:00:06 +0000 (10:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 10:00:06 +0000 (10:00 +0000)
am: c620e64f61

Change-Id: Iaa1ab50a323133cadfa4f39440fce982cde8d1fe


Trivial merge