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-07-01 15:27:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-01 15:27:13 +0000
commit58b6450671a280dfa5ed2359fea9feedf1803519 (patch)
treebab60d11faac81cb4131bcb558a1497e8f25da06 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7c2f38767b5d22a53a982ba023aa7d073dd86095 (diff)
parentdab6ab4c0066c79f2c036b5a24b7525ef6eb7799 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours am: 68f5622b33 -s ours am: 14502613fe -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions