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-07-15 17:09:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-15 17:09:36 +0000
commit1888f7c50d65f77a96207984112b2ef7d373dc83 (patch)
tree56e61238989fcaae61c45cbbb537501f596ba6ad /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb9a7bbce9e1346b2cb2b701ea16b265c45e7e790 (diff)
parent819e5de038dcd8b3d4c57f7755e2a76b5a3e28a9 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: e23bf50171 -s ours am: d00097533f -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions