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-06 14:34:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:34:16 +0000
commita44b12e7c41d9c89ada61e99a26457f9d8f0026c (patch)
tree14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent445c965e5c1f78d95dc2b3266636c41b2b4bfcf4 (diff)
parent7d7910a38f79dc65472689e4b960a8778ddc43e1 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ac0b376dde -s ours am: 5bc71ea527 -s ours am: 03dea08a2b -s ours am: d24d4a24d7 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions