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-03-13 17:08:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 17:08:30 +0000
commitdacc54a86a6aa130b02a84010ccdc72d31191402 (patch)
tree0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaec1836f4ceb35e4f10adac80b7bc0cbaabbc540 (diff)
parent86ae0e5480281e34ba5066ce10a8460a0e175f19 (diff)
[automerger skipped] RESTRICT AUTOMERGE am: 0bb93d4b1c am: d6f71caed5 am: b1fd7196e1 -s ours am: 102e9c5905 -s ours am: 5fc924b419 am: 86ae0e5480 -s ours
am skip reason: subject contains skip directive Change-Id: I66330f7c643596053638abc72ed5897b6a83308a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions