tree 0b9f9ede59440f2f414ff826b8852d504f098a12
parent 72569a387742812be7e87362721631beaa05028c
parent 18a53ab1aa846053e6de896e093bca5d9e42b6aa
author Baligh Uddin <baligh@google.com> 1404683155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404683155 +0000

am 18a53ab1: (-s ours) am 13157532: (-s ours) am 2ea40009: (-s ours) am 23b816b1: (-s ours) Import translations. DO NOT MERGE

* commit '18a53ab1aa846053e6de896e093bca5d9e42b6aa':
  Import translations. DO NOT MERGE