summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-06 07:14:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-04-06 07:14:29 +0000
commit03c0e8be4a4607db1532fa6006c4056345faa8e9 (patch)
treeaab7092f24f30dd5960085f1f9b2c5efbcb8003a /tools/aapt2/java/JavaClassGenerator.cpp
parentb7870fc874e804a51148985df2792a7cdb394abd (diff)
parent317b7118858f6b1e979c95bf4934e44bae50db3c (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bcfcd4018b -s ours am: d8b1fd9af3 -s ours" into sc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions