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-06-29 08:06:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-29 08:06:54 +0000
commita60c18f443bfd10af43fbe5d4dd939195423df12 (patch)
tree927ddc20a4f171f9cd6146a9b5cab54361bfa2d8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent45ef6e224f87f1f25bd892a69759b30c8a46ac5b (diff)
parent4d473e9a285239aa2439449c3368704fc7cb9572 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64aef342c9 -s ours am: a957158cc7 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions