tree 35f0f64ed455ff56a9d620be9d69cce14b3024a1
parent 2a26760e897c14208549ff60457002209b4b08c7
parent 023c36e3111270286fca09c9e336fb68f9a14f53
author Baligh Uddin <baligh@google.com> 1411326598 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411326598 +0000

am 023c36e3: (-s ours) am 8487eea1: (-s ours) am 6d2708d9: (-s ours) Import translations. DO NOT MERGE

* commit '023c36e3111270286fca09c9e336fb68f9a14f53':
  Import translations. DO NOT MERGE