summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-11-09 16:11:57 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-09 16:11:57 -0800
commit9d86289f3b6eaf519bd336d79e69a56efcdc44fe (patch)
tree5034a5921cfa33b9312722e06eae302e21d0cf8f
parent43ee27f969c59063204634ad5f323e3d0d9c2947 (diff)
parentbe592d32269305ef2faa88615ddfcc89e1cd05bb (diff)
downloadbase-9d86289f3b6eaf519bd336d79e69a56efcdc44fe.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: be592d3226 -s ours am skip reason: subject contains skip directive Change-Id: Ic60a82f7aa092e2c117ac5879cf7dcbaaafb4af3
0 files changed, 0 insertions, 0 deletions