tree db35656d6647ad8866ef058d32a8b681a4c07d6b
parent 212e7034f9302cbd0f4c5f4481dba7c257465a9d
parent 7a40e4392783bf2e3ee731ea9678e6a0ed764583
author Baligh Uddin <baligh@google.com> 1410886235 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410886235 +0000

am 7a40e439: (-s ours) am f242aee4: (-s ours) Import translations. DO NOT MERGE

* commit '7a40e4392783bf2e3ee731ea9678e6a0ed764583':
  Import translations. DO NOT MERGE