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-05-21 18:15:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-21 18:15:36 +0000
commit6762aaf95b32a6cd6af4d8ba59f07bbd128f5a76 (patch)
tree76f95bf01435ddb556ae7bb56f1f820e446d5f45 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb72c3784327ff33667916103d88c934758bfc898 (diff)
parent1cc67a0883da7b2c52f406424d45d645e182a731 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c86de6f965 -s ours" into rvc-d1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions