tree 6c871891b01af459f61f2ac887c32d08aceb0ae4
parent 0baea722ef3d1f6bac155cd59578b2875128007a
parent abb607fc9b281fce764900940a49921bd5554885
author Bill Yi <byi@google.com> 1474538191 +0000
committer android-build-merger <android-build-merger@google.com> 1474538191 +0000

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

Change-Id: Ie324250d9e2f2fab6b2557e1122e9065f96067d1