tree f76faa474d0efb6174ac0bab0a21b9f781b7bce9
parent 466df70cc58c97497fa4ab27c5b3ba473a1f2b3a
parent 6833a8dde70b25190c640674fae0712f2306521f
author Hugo Benichi <hugobenichi@google.com> 1506941938 +0000
committer android-build-merger <android-build-merger@google.com> 1506941938 +0000

Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am: 1211941aa0 am: 0d506fc4f4 am: eced6cd14a
am: 6833a8dde7

Change-Id: Ifab1ace2ddf79f611d1f05080e2c31a4992810b7