tree 9b8bcb3a9e766295c8e1052fbb37f801adfbd9c0
parent 5c8eeb46cf72de4d23dac347225f17913e15f7ba
parent 1c9c158a0fc834d93766fb7a16a7621f5e3dd131
author Baligh Uddin <baligh@google.com> 1404676000 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404676000 +0000

am 5ec67d05: (-s ours) am 9ec72a88: (-s ours) am e05d7620: (-s ours) am fc5b2c3e: (-s ours) Import translations. DO NOT MERGE

* commit '5ec67d05ab785b4611c89e2c170bc9c3aea7769e':
  Import translations. DO NOT MERGE