tree afde87496d90a06df22d5e9b074b6b4c4859c1da
parent 4f2b62e6fa67e0b190258f72b13d6e209672e91f
parent 914e84dbce84228dce478c092592765f0ac95795
author Bill Yi <byi@google.com> 1560482686 -0700
committer android-build-merger <android-build-merger@google.com> 1560482686 -0700

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

Change-Id: Id8df2f5c4acf09c893227f77b6062048be25f557