tree e34e19a6a30403ef758e66d08dfce332cc303c25
parent 849805b804fc4a33448d45cef4ac26728904787b
parent 1211941aa0ec8a65385dddfdae17ce6580172ab6
author Hugo Benichi <hugobenichi@google.com> 1506940582 +0000
committer android-build-merger <android-build-merger@google.com> 1506940582 +0000

Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
am: 1211941aa0

Change-Id: I169e1d48bffab3326dd61011b7747c1400b9bc74