tree 99ec9a021fac9522e971f71e6108be52010516e6
parent a7dbcfe78122161c3cae9e0213ae33a3039c79d1
parent fa584b69a579523c9df0e7ec1ea7748587821014
author Baligh Uddin <baligh@google.com> 1419350847 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419350847 +0000

am fa584b69: (-s ours) Import translations. DO NOT MERGE

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