tree 227d0bc3a68d2939001b5a2c179be86a3cb1d058
parent 3e0ae1d74cf55856bd18dee44715f4e5c0147c57
parent 73a0a726a693f1fad04df012bef0ac5c5f56cdea
author Bill Yi <byi@google.com> 1470132305 +0000
committer android-build-merger <android-build-merger@google.com> 1470132305 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary
am: 73a0a726a6  -s ours

Change-Id: I410c82c057cc2683263d49afeef5b3e89e052d41