tree 663a6af1f158abf03fbe3453c077b8a669ac8adf
parent 8ed634a1e0f764e6dc78df63ad31fb7e8d3094dd
parent f16ef62acdddc77d6fe0026de8f39b1c2f4d986e
author Bill Yi <byi@google.com> 1564175912 -0700
committer android-build-merger <android-build-merger@google.com> 1564175912 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into ub-launcher3-qt-qpr1-dev
am: f16ef62acd -s ours
am skip reason: subject contains skip directive

Change-Id: I7179795fa9bae40ae2e5e76b7d49a3a94c7b61a2