tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 7e0c421585928f7de9336f6af45000b2e3ca9ddc
parent fdfebdad758d9f140c89e4725ca10a265b9d81b2
author Baligh Uddin <baligh@google.com> 1392411190 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411190 +0000

am fdfebdad: (-s ours) am 0493fb93: (-s ours) am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE

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