tree e077ca9d13ef86a2589c42e576e40efcc40415f8
parent 2e71b8351cb51946d391b1efa5c593bb74e69bce
parent 24790aa3c89b90299cfc6d5cb9016d6642198108
author Bill Yi <byi@google.com> 1568849289 -0700
committer android-build-merger <android-build-merger@google.com> 1568849289 -0700

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

Change-Id: I984662cb4a83e8a9536da7799a2f317c6facbb24