| commit | c95cbb9588c0bc78974a0dc3b271eebdd021f439 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build-merger@google.com> | Fri Jan 27 06:39:52 2017 +0000 |
| committer | The Android Automerger <android-build-merger@google.com> | Fri Jan 27 06:39:52 2017 +0000 |
| tree | 19ecce9970e730fef498c8367fff2fd7c9b8e79f | |
| parent | 2bb684daf5798f712d354d2475ae75f6cf6d3deb [diff] | |
| parent | f2bcda635cca9dc6f00b6efb2b9cf92892525bab [diff] |
Merge commit 'f2bcda635cca9dc6f00b6efb2b9cf92892525bab' into nyc-mr1-dev-plus-aosp * commit 'f2bcda635cca9dc6f00b6efb2b9cf92892525bab': Captive portals: login activity probes like NetworkMonitor Logging improvements in CaptivePortalLoginActivity Captive portal systel log improvements Fix flaky IpPrefixTest. Removing bogus file added by mistake frameworks-test: adding missing @SmallTest Netd events: record connect() success/errno Add missing dependency. Show notification for always-on app VPN