summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-02 13:49:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-02 13:49:42 +0000
commit82441a5d83c08630dd4d419d95d1ca430efe388a (patch)
tree9e079737a0693b510d94e982d9880b23204607be /tools/aapt2/java/JavaClassGenerator_test.cpp
parent69b924843a9d9fcfcabc193c435d1d2a72280d16 (diff)
parent026306912cc709aa90f236ea3d34fd75a75fe15c (diff)
Merge "Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev am: dfb06b858a am: 5100667505" into rvc-d1-dev-plus-aosp am: 026306912c
Original change: undetermined Change-Id: I891fc36c1d2ae522ed7f01421edee983b776dffd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions