tree 477ec3471fd9872b81b05f438afe104d06acd35f
parent 8daffca0475fb830e5b24d0485942a25766e2bff
parent c9f49b88bcd891872398e857157b14795420767c
author Baligh Uddin <baligh@google.com> 1367365927 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367365927 -0700

am c9f49b88: (-s ours) am b4251873: (-s ours) am e5ae0bd3: Import translations. DO NOT MERGE

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