tree 6b0bb3e96ad6508759a6ac49b89155325c719850
parent f0055bc5e39e26de2dc3bbad1b2d40d96d79184e
parent 6316f5ff2a8c3de69e6580c9220809242683f0c1
author Baligh Uddin <baligh@google.com> 1404682650 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682650 +0000

am 6316f5ff: (-s ours) am 8d2d3d46: (-s ours) Import translations. DO NOT MERGE

* commit '6316f5ff2a8c3de69e6580c9220809242683f0c1':
  Import translations. DO NOT MERGE