diff options
| author | Paul Hu <paulhu@google.com> | 2019-05-15 15:09:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 15:09:16 -0700 |
| commit | ffa5c215cb8bc9bed74052250f08c54ca32aad70 (patch) | |
| tree | d8070ca5b78170696d0ce3df05317aaf6cc2b493 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 779a0b242ed8ae40fe48435bcfd97d0089277cf2 (diff) | |
| parent | e2695f1f60da8264c82758cded532c238f99408c (diff) | |
[automerger skipped] Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev am: 53e2a9b0ae -s ours
am: e2695f1f60 -s ours
am skip reason: change_id I1025da29beb53259f57bd9ca5648b32f2847ed4a with SHA1 c1af699968 is in history
Change-Id: I23bb868fd50941ec51dd6b3cd044f6504ca66d92
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions