tree d9265e0bbb2991f0ad57ebbb74f0d5c169f082cf
parent dfc8d1c4d171b34f7e0ad5365ab3d97c93acc0a6
parent a40102f5d5049d6656f98122bf23d7f27ecc6593
author Baligh Uddin <baligh@google.com> 1463599344 +0000
committer android-build-merger <android-build-merger@google.com> 1463599344 +0000

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

* commit 'a40102f5d5049d6656f98122bf23d7f27ecc6593':
  Import translations. DO NOT MERGE

Change-Id: I60a4f2802a3ec5a0f2184371c8f11a1ade693ba5