tree 4746f86f3fbd6c12be18a20de90035b382e885f1
parent a45626b879591fd458941d182506555168861863
parent 05236e77fed1b34f52b7378f5319ea1d45bbf482
author Hugo Benichi <hugobenichi@google.com> 1481279560 +0000
committer android-build-merger <android-build-merger@google.com> 1481279560 +0000

DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: 53d83d5142  -s ours am: a30ae5542b  -s ours
am: 05236e77fe

Change-Id: Iebd06f7c03b2068314c24a14a2b38d2413b88536