tree f714b7e4579688ad682c77fa54319ad6538bed23
parent dd141390895d6eaa6f7a3d96f93ea40fd64be358
parent c5784155bf7f12d4fa0710500a4ad96dd338cb88
author Baligh Uddin <baligh@google.com> 1461792839 +0000
committer android-build-merger <android-build-merger@google.com> 1461792839 +0000

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

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

Change-Id: I195c6c72a9a3425d5679a7024091c68aa7a52ee0