tree 1f8a26e5afc4ec3fd4da0328bb7bf1557fbd5793
parent acf5f23286bae3f9753fb29850fabd879fb686e6
parent 3e4c4987309b8cf76f524396738bfd75dd137498
author Baligh Uddin <baligh@google.com> 1414776042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414776042 +0000

am 3e4c4987: (-s ours) Import translations. DO NOT MERGE

* commit '3e4c4987309b8cf76f524396738bfd75dd137498':
  Import translations. DO NOT MERGE