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