tree 39efc38b9ae0c0dbef4fafdb93856279bd9adb28
parent 049a22bb30f20287674b2acf329cd7bf972379ea
parent 28d13bff5306fa45e41d7ea675aafe9e8a1113f4
author Baligh Uddin <baligh@google.com> 1409004437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409004437 +0000

am 28d13bff: (-s ours) am bbea2cec: (-s ours) Import translations. DO NOT MERGE

* commit '28d13bff5306fa45e41d7ea675aafe9e8a1113f4':
  Import translations. DO NOT MERGE