tree 54f863d1e1b179855bf8931b5deea5d6f9264cc4
parent c6d164b5b99ca5d50dbd0723b61fdf4476954d50
parent 2f922b8900b80e20802c73f64284d5df62b3e7a6
author Baligh Uddin <baligh@google.com> 1408141817 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408141817 +0000

am 2f922b89: (-s ours) Import translations. DO NOT MERGE

* commit '2f922b8900b80e20802c73f64284d5df62b3e7a6':
  Import translations. DO NOT MERGE