summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-11-09 16:05:26 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-09 16:05:26 -0800
commit4cbdb405481d3ef0f89dc910dd3d8d2326b55ff0 (patch)
tree5034a5921cfa33b9312722e06eae302e21d0cf8f
parent665890298406c994fb95657220fbefcd138c9236 (diff)
parent79548ac59a46e5bc854d45ef040de50659bbf22c (diff)
downloadbase-4cbdb405481d3ef0f89dc910dd3d8d2326b55ff0.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 79548ac59a -s ours am skip reason: subject contains skip directive Change-Id: I6b11220567a0491323c6eb2ff0f7527a0d00ac26
0 files changed, 0 insertions, 0 deletions