summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJonathan Scott <scottjonathan@google.com>2019-05-08 19:40:11 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-08 19:40:11 -0700
commit77d21995fc39c5fa1e5c59faf5c345f362989382 (patch)
tree909e79148d3f33cf9fc635f7762b6870a5c11e9e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent94d5cdca2a666dd64de8166bc4d643f145a7ff99 (diff)
parent906080bd27a8cc2d1dafc9f4f0ff4d82fca478d6 (diff)
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58 am: 970863ea62 am: 9707affaa8
am: 906080bd27 -s ours am skip reason: subject contains skip directive Change-Id: I4faa3f6284b8708d2ece0f96db8ec498bc841299
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions