Lorenzo Colitti 8fea8e5bbd Merge "ConnectivityServiceTest: fix flaky tests" ...

am: b8bbd30203

Change-Id: I0577f6b48de8a95e7d12e58a672fb0374ced9403

2017-01-27 09:51:32 +00:00

..

android/net

frameworks-test: adding missing @SmallTest

2017-01-26 18:52:45 +09:00

com/android/server

Merge "ConnectivityServiceTest: fix flaky tests"

2017-01-27 09:51:32 +00:00