tree 1669d438bbef823556ed56a8aa5faee3da2da1c4
parent 78c13ce122efaaeb6489dc96db39d8adb225a4bd
parent ae4c3c82fc687c342c76a7dc27d504b8aeba12cf
author The Android Open Source Project <initial-contribution@android.com> 1493733109 +0000
committer android-build-merger <android-build-merger@google.com> 1493733109 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval am: 70cbd2cdb9  -s ours
am: ae4c3c82fc  -s ours

Change-Id: Iab6ac47ca35c8305c7a79e22330b3ef9b1a64358