tree d5649a4332e4d2f72a7c537791781752ba0b6e6f
parent c206a51130e358e6f76cfa2ea8c33d4434892a4a
parent 203abe3f88fb7a8983566060bc179eaf90a2ccf1
author Baligh Uddin <baligh@google.com> 1389055232 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389055232 +0000

am 203abe3f: (-s ours) am cdfbc2e8: (-s ours) am d4c5a505: (-s ours) am f12a0823: (-s ours) am ab233007: (-s ours) Import translations. DO NOT MERGE

* commit '203abe3f88fb7a8983566060bc179eaf90a2ccf1':
  Import translations. DO NOT MERGE