tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent a9a32b1400c72210fd6e3a9b2b3aa7961fa9d7b9
parent c69ae04f43f0857f4883599003ce94e1ede11d60
author Baligh Uddin <baligh@google.com> 1387467715 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387467715 +0000

am c69ae04f: (-s ours) am 79eaeaf7: (-s ours) am 33a5fd70: (-s ours) am 415c34b9: (-s ours) Import translations. DO NOT MERGE

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