| commit | 287c7f77cade3d4c3cc3fdc9dca37b3aa69b6662 | [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 | 93bd12233f5dc75e6829ced4629e0cbd006d290e [diff] | |
| parent | 087d29e0a2380ccb90e847e5daa52f50235731f0 [diff] |
Merge commit '087d29e0a2380ccb90e847e5daa52f50235731f0' into nyc-mr1-dev-plus-aosp * commit '087d29e0a2380ccb90e847e5daa52f50235731f0': 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