OSDN Git Service

Merge "ConnectivityServiceTest: fix flakyness" am: a82cac1452
authorHugo Benichi <hugobenichi@google.com>
Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)
commiteb9d0f16aa029cea4d232989af937bc42dee6893
treeced90770eca9acb9dbed656801cd657474e13c2d
parent7ee4542d17040bb3c2c45f93762e4e3c24ca4142
parent004f36d5bca7bce796ad20d97364e0812ca9b21c
Merge "ConnectivityServiceTest: fix flakyness" am: a82cac1452
am: 004f36d5bc

Change-Id: Id8468bd8e38927341cdbebe2925c0bfd4bb37c0c