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-09 23:05:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-09 23:05:58 +0000
commitdc8bec3944aec829555fa18582206f92540bc8a7 (patch)
treed4fdd195bcdc480e0ee4be1bb31bcb9182599942 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent54530829bdfd48dbbf3da94ce84cded990a0986c (diff)
parent8ced87d1639d96ece2e98ad5fb48026799aa55d5 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cd259caf54 -s ours am: fa42ef82ca -s ours am: b3b360a661 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions