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-05-18 23:41:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-18 23:41:40 +0000
commit39a52d2d730081eb04e4d8ef2b5e0320efcc2124 (patch)
treec16715a40d927bd3553ff751f48176cfe0258109 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf51cbe76b2758b6827b6138945d334586d93a534 (diff)
parent6c679f89bf4e84fd02dd233d476f9eb85c743f36 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e7f3897b6a -s ours am: effc2bdd8c -s ours am: f241a62445 -s ours am: 43f95a77d9 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions