tree 9b77364894aa032d1f601949a5c9e8edb999ed34
parent 2790a7218b6fc4c6acf35da3b5a4bf9f0d8ac6c7
parent debe4cea3916d9f01fe8591cd9974d0e17ad08bb
author Hugo Benichi <hugobenichi@google.com> 1484098921 +0000
committer android-build-merger <android-build-merger@google.com> 1484098921 +0000

DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 2c02197bdd  -s ours am: 2a913049ab  -s ours
am: debe4cea39

Change-Id: I6f4c7a0c15373e56fc178f287f6a0eb54d0d4018