tree 2f329d8a233fff4a4a57b96bae8eec8c9dd7b379
parent a7ef8db366209ee406ad476f2dcedbe221638365
parent 835f3b1a2d303f4ec54afa14890de59da6cf5f96
author Baligh Uddin <baligh@google.com> 1409004438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409004438 +0000

am 835f3b1a: (-s ours) am 3a9b1b53: (-s ours) Import translations. DO NOT MERGE

* commit '835f3b1a2d303f4ec54afa14890de59da6cf5f96':
  Import translations. DO NOT MERGE