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-21 08:55:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-21 08:55:18 +0000
commitc1a9dcb16819c25e1cbe4d30894a4b02de78ba5a (patch)
tree58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf0e166e5c4f20539ae9bcecf9b4a8f4addd8db16 (diff)
parent854f62425739adac3057618c6f9aa14f03ac1bfc (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8db9af6fb5 -s ours am: 6c794475b2 -s ours am: c898560bb2 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions