tree bd81b501549e822c60f71535da292f755eb78dd1
parent 8609c70a9a218b5594d68f843584d251330aaf05
parent 36a300e140c4cc1f691ae221b853a90a6b148d87
author Baligh Uddin <baligh@google.com> 1381586156 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381586156 -0700

am 36a300e1: (-s ours) am e1bc1951: (-s ours) Import translations. DO NOT MERGE

* commit '36a300e140c4cc1f691ae221b853a90a6b148d87':
  Import translations. DO NOT MERGE