summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-07-02 16:19:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-02 16:19:58 +0000
commit8a2b5b32c7df9bd95b9ef67ad5c67a684074a3b9 (patch)
treef820e1f96481c55bc0bcc085c1e780f760eeb35b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent36ca4087e8732204543120bfe8c4a0bbd68e7fea (diff)
parent607c325a58f42b0e53a853669c45140ba75ccd2b (diff)
[automerger skipped] Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b41 am: 77de09efd5 am: 0979fa6cf1 am: 607c325a58 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065945 Change-Id: I35d0b0a8d8a53e5601319cc11075070a584b1c84
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions