tree d5006f64f76a9b03ac225ee3bae3b63e651a81e6
parent 755df5d288d936e4278c485964c39067f24e4076
parent 2a014399aef1b7d404e0f7ebcf9aa4074b7c0b3c
author Baligh Uddin <baligh@google.com> 1410886232 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410886232 +0000

am 2a014399: (-s ours) am 76556a1b: (-s ours) Import translations. DO NOT MERGE

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