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-07-21 20:07:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-21 20:07:44 +0000
commit43984dbac983a43e7a44d27bd731735933c996aa (patch)
treee09d00a91d642651c1d579625121cbd76dbf515c /tools/aapt2/java/JavaClassGenerator.cpp
parent847e5aefbe03c86576cbac94ef27042ccd3795f7 (diff)
parentb8b8cbdf1474e71a9a7f0f06c4f25c91c8ffd14f (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 38574ef1c9 -s ours am: 68cb6cca98 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions