summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-11-08 22:55:00 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-08 22:55:00 -0800
commit876e21a3ce714130fbdf6e1dd878c4a18f603b76 (patch)
tree5034a5921cfa33b9312722e06eae302e21d0cf8f
parentf93cf93704a2829d65a49690e312562dd3956252 (diff)
parented1acb11b9aea31073a3cc58829b8599fb2cae98 (diff)
downloadbase-876e21a3ce714130fbdf6e1dd878c4a18f603b76.tar.gz
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: ed1acb11b9 -s ours am skip reason: subject contains skip directive Change-Id: Ic4be920322d722c35857a2b84bd9da9c7bbd9a7e
0 files changed, 0 insertions, 0 deletions