tree 49331011f82e614c6c01fe449cd893e756d92fc4
parent d8a6c59d3df483536c3b3b538297cb0ef5336976
parent a9bec69a95e6c6a8629d76eab3d090e688f046e9
author Baligh Uddin <baligh@google.com> 1389055486 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389055486 +0000

am a9bec69a: (-s ours) am fce88971: (-s ours) am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

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