tree f06004f9125d07bdbb12714cf1ff6318dabfbbc9
parent 588bd13c7a595d1756a10f33fd674615fb616c3e
parent f9a13f7cf859443f7dde4c0179defaafc45ef44f
author Baligh Uddin <baligh@google.com> 1462293832 +0000
committer android-build-merger <android-build-merger@google.com> 1462293832 +0000

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

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

Change-Id: I398cb2c24a0c2b7744558c4048035c54f1f98138