diff options
| author | Paul Hu <paulhu@google.com> | 2019-05-15 17:48:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 17:48:12 -0700 |
| commit | 264e57bd4b229d4d5e5e90a04a04c498785be0fe (patch) | |
| tree | cc3e342eefbcf28c7ffa8b40b6a332dd482d5f0c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4f47c6323ff30fd7cae91aa7749815a7a2afb87b (diff) | |
| parent | ffa5c215cb8bc9bed74052250f08c54ca32aad70 (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: ffa5c215cb -s ours
am skip reason: change_id I1025da29beb53259f57bd9ca5648b32f2847ed4a with SHA1 c1af699968 is in history
Change-Id: Ida61151b46857b8bac714d422bc263efa85b1f16
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions