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-25 05:46:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-25 05:46:52 +0000
commit7c1c75ddcac625af3184fc51afb7d061f350d355 (patch)
tree4a499ff9cb51c293c96c85d5bf4a677084a9ee3c /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta4393d82ed01d2bea8983d92c8a4e84f404bf642 (diff)
parent70c4edfc33ec1b25fa6384822138dea02d1a3e48 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f32cba8606 -s ours am: c93a4a583b -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions