tree be7a17e83f4274c627f9101fa74e0eaa6ceec5c9
parent 0cce4184dad2d8c507e1d509d37fd9de9e0e618e
parent 883bf96b0a564cac0fce845fe249147c4bd1cad5
author Baligh Uddin <baligh@google.com> 1355189945 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355189945 -0800

am 883bf96b: Import translations. DO NOT MERGE

* commit '883bf96b0a564cac0fce845fe249147c4bd1cad5':
  Import translations. DO NOT MERGE