summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPeter Kalauskas <peskal@google.com>2020-05-18 22:33:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 22:33:33 +0000
commit900efd6fce56f2c252b7ed8af9eed0443eb17f6a (patch)
tree8318427510caaf57ffb88963c77a0a62524f7ce1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent48d0bcd5c552d639e3c40d36e4774304aebfe77c (diff)
parentc54f85531d683a43c0865a52520fbf5247b3eaa7 (diff)
[automerger skipped] Merge "Check user unlocked before write to /data/system_ce/0/snapshots" am: 8737830ed4 am: 00ac337a69 -s ours am: c54f85531d -s ours
am skip reason: Change-Id Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is in history Change-Id: Idc08fa45ff5625681fec277bb5a904cc46e3194f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions