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-02-11 22:47:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 22:47:44 +0000
commite6e36d32dcea7cc18d3ab9e58a0e737496d89e60 (patch)
treeafbbf2249c69903d81dab832e8df11ff0d11554c /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc43c23cc55b8d7da843c79152c98c31491682141 (diff)
parent30afdb530088340465e25a126410fe23e824a7bc (diff)
[automerger skipped] Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf0341 am: 285f6781c1 am: 30afdb5300 -s ours
am skip reason: Change-Id I2b4224e79e013bae27ee068b0a0898b5afa5489a with SHA-1 413dd36486 is in history Change-Id: Icaa2ce2ef30ea16b5920bb45d663c444da597c91
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions