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:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-02 14:05:18 +0000
commit8252d66eda7b0758d5853543d38d498021555a29 (patch)
treef8c0e3bb2de776cd2ec00eb29cd4b53521149de9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent191bc3a4d88cf62124ab6fba6f9708d9b17ee91d (diff)
parent82441a5d83c08630dd4d419d95d1ca430efe388a (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 am: 82441a5d83
Original change: undetermined Change-Id: I27bf3d7278d982066fb5def1b3129ee0b30fdbac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions