tree 40125b17d561bbfd422f40b3042bed73c9116ce3
parent 914e84dbce84228dce478c092592765f0ac95795
parent 924a96651d5dd30559c8420fa27789b248a1b943
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-dev
am: 924a96651d -s ours
am skip reason: subject contains skip directive

Change-Id: I6c13356eaf5ada6d92099d6a8022a334f753fb83