diff options
| author | The Android Automerger <android-build-merger@google.com> | 2017-01-27 06:39:52 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build-merger@google.com> | 2017-01-27 06:39:52 +0000 |
| commit | 6a688ca1add03a888c0e80d358f29455bbdf82c7 (patch) | |
| tree | 29b09759d8d48191bfe977537588ec37e0696c95 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 7bc2aebd5370e90a5a838542a3703d3144be4a21 (diff) | |
| parent | 88932754ffdcbffb3cb43e03991e5eb598c10458 (diff) | |
Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
* commit '88932754ffdcbffb3cb43e03991e5eb598c10458':
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions