summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorPaul Hu <paulhu@google.com>2019-05-14 21:51:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-14 21:51:21 -0700
commite2695f1f60da8264c82758cded532c238f99408c (patch)
treed8070ca5b78170696d0ce3df05317aaf6cc2b493 /tools/aapt2/java/JavaClassGenerator.cpp
parent273f61880e39f1dd66f48091c90c90b66de75890 (diff)
parent53e2a9b0aef3df2418e59348bd2694cfe67551bf (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 skip reason: change_id I1025da29beb53259f57bd9ca5648b32f2847ed4a with SHA1 c1af699968 is in history Change-Id: I0fd395b418475c6b9d8ac7dbd363d43e437d2203
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions