tree d3333c4076503ac0fbc56772afffe1e8becf13a3
parent cf2393e05635eb7a3276ccefc7792b21edf287e1
parent 0f07b87420c37cc7c2b2d666a3d4e11f637aafc0
author Bill Yi <byi@google.com> 1557475591 -0700
committer android-build-merger <android-build-merger@google.com> 1557475591 -0700

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

Change-Id: I97086bc294d8cb19b8935234b4759462d882f486