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-05 15:06:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-05 15:06:18 +0000
commit7fda4abb9ffccf0e4cbac70441a19d32e14479cb (patch)
treefe4e045e14c60f101e2b78f3747ee8918c10a04b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent166574a9a91e44818c8c9ee39a7579b94bd58321 (diff)
parent092d8d262590c031eeb79ba2e660bca108307485 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions