tree 42e365b3d851f5d196ef37802e594a1d1c27fc5a
parent 45ba3d610543e0d1bcfad89abf4949675d5f14da
parent b1147ee0636f35f0e96b1ef8c58d9783757391c2
author Baligh Uddin <baligh@google.com> 1404238846 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404238846 +0000

am b1147ee0: (-s ours) am 1f295594: (-s ours) Import translations. DO NOT MERGE

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