diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-30 19:54:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-30 19:54:20 -0700 |
| commit | c38717a2d152ee7a60232fe5fa772d0bee8f87c6 (patch) | |
| tree | 442705758d9d74291df87630402692593678aed5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bd28b0ad7d0e91705203bbd8c3cbbbf48da2ab02 (diff) | |
| parent | f98021e9ad54e792ec19a29b4787d3f2f29ca20e (diff) | |
[automerger skipped] Merge "Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS" into pi-dev
am: f98021e9ad -s ours
Change-Id: Iff1b37f46a24acb5b441d1ab4beb1fcd24e4947c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions