tree a64ffbec49a47a0ae7b18bef6141b22c66771ec9
parent 0571285d23c59cb976e99fa1412d790d81e01541
parent 68b0ee54c1f77b9884c100ad6b21887b1b9d37e8
author Baligh Uddin <baligh@google.com> 1414775602 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414775602 +0000

am 68b0ee54: (-s ours) Import translations. DO NOT MERGE

* commit '68b0ee54c1f77b9884c100ad6b21887b1b9d37e8':
  Import translations. DO NOT MERGE