tree b0a04aa9fbd00a24830b220788899de871dbb22e
parent 35af18baef4a9cac4322658c53e1a859a16d0d2b
parent 94e803b2d5884b1a6c03df48f6c70f9eb1ec3646
author Baligh Uddin <baligh@google.com> 1412095958 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095958 +0000

am 94e803b2: (-s ours) am 7a02fa66: (-s ours) am 780660b9: (-s ours) Import translations. DO NOT MERGE

* commit '94e803b2d5884b1a6c03df48f6c70f9eb1ec3646':
  Import translations. DO NOT MERGE