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-01-29 19:47:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-29 19:47:56 +0000
commit0a20294de1afc832fefb351b2f2011076714eaba (patch)
tree3768534364758584d0b0e1ed43eb12054b96e2f1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5e3bd2953465db53656992be295677a40a3bece4 (diff)
parent7e22de9e62b9d072b16de3862e02d7d244da31ca (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 61719eca99 -s ours am: 7e22de9e62 -s ours
am skip reason: subject contains skip directive Change-Id: Ic6e1c6883bcb24c12945ad4430810d772ba47680
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions