tree f6797ed74906c47a6ba42c1be462f4639ccb1bf4
parent 097e484d05a941c1f8d9c5c8abdcb5070faa23fe
parent c0d65c98d8234a9195b8b5df66245cc1c0d9eab4
author Bill Yi <byi@google.com> 1470955638 +0000
committer android-build-merger <android-build-merger@google.com> 1470955638 +0000

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

Change-Id: I6e8232b502f582d63782ba5bcf8ad06fda297a7e