tree dd054363bad48fdfeb6e1c546088972fcb832cdd
parent eabdaf764bec0787237f60b0564a224ed315f8f8
parent 1826664ef92dd7ad658c14a5a79f8d0efe203556
author Bill Yi <byi@google.com> 1568225260 -0700
committer android-build-merger <android-build-merger@google.com> 1568225260 -0700

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

Change-Id: I90f0a48c36ba9a983203936722da6fde56fd636b