tree 29e4a0180fc7287a4bd03f0c329af3a23ed57b98
parent 7520a07036a36fe78b384ce2bf5ebbd910b620b2
parent 2c02197bdd12378c7b2f8ee4bcaa625b2c564ede
author Hugo Benichi <hugobenichi@google.com> 1484097480 +0000
committer android-build-merger <android-build-merger@google.com> 1484097480 +0000

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

Change-Id: I12ea7b87369c3228bb1fcc914cfdb316a3b501ce