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-24 18:23:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-24 18:23:07 +0000
commit82e5c5d78e98e9498075e37e68552ebd6ce08c3e (patch)
treee43cbe9254723df5333191bf99e06816901c1a18 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb9051228528cdf47d11f41d78a6cd985a060fdb0 (diff)
parent60ec28e566baad5671d0b89f24bf1d2b6f5447f8 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2a35e0e321 -s ours am: 4e28a11a02 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions