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-01 15:07:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-01 15:07:06 +0000
commit1e52c729c674a139ffce9a398558f4fea1cdddff (patch)
tree3898517807cc2696cca821a40896680a0513005b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5a42edb04c80426eea6bd897cf75792f7beae88a (diff)
parentea674db1c58d0b37bd3d747aa53151ff6fc16a92 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2a59edbefd -s ours am: b678fca605 -s ours am: 7dc8b509e6 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions