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 20:38:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 20:38:20 +0000
commitdd57568ac769851e09eeb5046539d3f2cb7924cf (patch)
tree6de2bd287377b85f9b835ff38129b0ce4106f177 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6b1b31f0cfbfc49de9dc5974e4e136728ec8b5c5 (diff)
parent2b0a36a65c78459e69e106b5678d1420e9993468 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 54580f8419 -s ours am: 7b6b19b4ab -s ours am: 2b0a36a65c -s ours
am skip reason: subject contains skip directive Change-Id: I8c8a91321d6910c715efe3988640210d377cfde5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions