tree 42f1ed97caaa010caef652624a33df18f1b10d16
parent 2f47ca02823ba6f2f10e2a5d233e377037f0c4b4
parent 21386e34def33022f8eb7389cc18f9e02256af8c
author Baligh Uddin <baligh@google.com> 1404670961 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404670961 +0000

am 21386e34: (-s ours) am 5179b9a3: (-s ours) Import translations. DO NOT MERGE

* commit '21386e34def33022f8eb7389cc18f9e02256af8c':
  Import translations. DO NOT MERGE