tree 1ff0e3c28d5ee019dcc2f871fc234f73e4b435ab
parent bdeebbb9430bb22dc28cfcfd7f8bc8d90c629db6
parent ce231c53bad8d3b2f84228750debbed3419cd862
author Bill Yi <byi@google.com> 1470303813 +0000
committer android-build-merger <android-build-merger@google.com> 1470303813 +0000

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

Change-Id: Ibdac423b28937e93bb83eeea5b63962b9c3fca6c