diff options
| author | Paul Hu <paulhu@google.com> | 2019-05-14 22:48:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-14 22:48:51 -0700 |
| commit | 33574774f9d2c78b0c8b8b467c760e01e94967db (patch) | |
| tree | 3e909e5143402720a2a336fa3425c7c9a016fb3f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 73c0d48b14488c93b2f42a1e149e4be8499d3469 (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: I57914fd792bcd76fa695dc4b626c95fbdb8be1f3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions