tree afde87496d90a06df22d5e9b074b6b4c4859c1da
parent 678731d6f0603d2ce1bf5fdb15cb5e53c28ba054
parent 80515713a3dc145165ad4fc3b003f473dcddeeaf
author Bill Yi <byi@google.com> 1560485612 -0700
committer android-build-merger <android-build-merger@google.com> 1560485612 -0700

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

Change-Id: I04e4a0f5e2be044212574d68bec2a6e6a61c1977