tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 2cbecedbb4d32cc65c12f4792448692b0a1acc6b
parent c96224cb116972574e4820295909401d503ff8aa
author Baligh Uddin <baligh@google.com> 1392411529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411529 +0000

am c96224cb: (-s ours) am 85384d66: (-s ours) am 6e0d2c19: (-s ours) am 90ec376f: (-s ours) Import translations. DO NOT MERGE

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