tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent caea07c17ed11600b50f067690f10750c7106311
parent 5560a6d60c00528ca0b97e7c9a5b1622f8ab9cd2
author Baligh Uddin <baligh@google.com> 1392411528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411528 +0000

am 5560a6d6: (-s ours) am 8608b163: (-s ours) am e02cb223: (-s ours) Import translations. DO NOT MERGE

* commit '5560a6d60c00528ca0b97e7c9a5b1622f8ab9cd2':
  Import translations. DO NOT MERGE