tree a8f81269587187a392696cc54559d904339ea0bd
parent 5dff20689f7d53038feb0ebd68c3ec936a650af9
parent bc523546b0a24cdffaa1401d6187e0da74bcaf07
author Baligh Uddin <baligh@google.com> 1414775760 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414775760 +0000

am bc523546: (-s ours) am 0e7850d7: (-s ours) Import translations. DO NOT MERGE

* commit 'bc523546b0a24cdffaa1401d6187e0da74bcaf07':
  Import translations. DO NOT MERGE