tree db9891e1a04cc7ca8d0ce5539cdb8a588e8896a5
parent 0c99e434d36c82f6853cdefa4c794193767809ed
parent 328db0798ab34d71de77e549c97a0ef4a7d2b65c
author Baligh Uddin <baligh@google.com> 1380918982 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380918982 -0700

am d91ddee8: (-s ours) am 672aaa1e: (-s ours) am 92728d02: (-s ours) Import translations. DO NOT MERGE

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