tree db35656d6647ad8866ef058d32a8b681a4c07d6b
parent 3daafd3bf6de26ce926d2cce663dce990179250b
parent a86436cd21d0fcfd8a2eab853a943b23d39f500c
author Baligh Uddin <baligh@google.com> 1413765283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413765283 +0000

am a86436cd: (-s ours) am f02cea2e: (-s ours) Import translations. DO NOT MERGE

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