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 14:05:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-02 14:05:32 +0000
commit50783e4728908818a6dc73cff8a99fc4ad3a21cb (patch)
treef8c0e3bb2de776cd2ec00eb29cd4b53521149de9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8252d66eda7b0758d5853543d38d498021555a29 (diff)
parent7389d3b409d7462f95269ee65ef71890d11662b0 (diff)
Merge "Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev am: dfb06b858a am: dd86940501 am: 2dad675260" into rvc-qpr-dev-plus-aosp am: 7389d3b409
Original change: undetermined Change-Id: I3bed5c28e44bdaf68b2a31e0d6ae70321fcc00f8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions