summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 21:50:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-10 21:50:32 +0000
commitf07b4c0e976549118de195926e81e4290ef3e88c (patch)
treee323bf8c9844d259ec2af71ae7381b1bf5d9c397 /tools/aapt2/java/JavaClassGenerator.cpp
parentf5854bd63798ae8fd82ce154345ca40442b03f19 (diff)
parent9681472040795445562fc1f9784aa3f1303ac916 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 14d8e24fef -s ours am: c36033f80a -s ours am: 0c5d9530a9 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions