tree 82ed7e31895a031a5f7b6a7b91dcc24821565eb3
parent 5a55f567d9dcdb7a255cfcfeb86d9bb0add43ed6
parent 12d6412978761f1aab14fbe9244d14c7cefc63b8
author Baligh Uddin <baligh@google.com> 1404682060 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682060 +0000

am 12d64129: (-s ours) am c53e033e: (-s ours) Import translations. DO NOT MERGE

* commit '12d6412978761f1aab14fbe9244d14c7cefc63b8':
  Import translations. DO NOT MERGE