tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent 4e7091d39266182af18b5fcf7bad3c28a7dfbfc6
parent 8609c70a9a218b5594d68f843584d251330aaf05
author Baligh Uddin <baligh@google.com> 1392410208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410208 +0000

am 8609c70a: (-s ours) am 91b90c09: (-s ours) Import translations. DO NOT MERGE

* commit '8609c70a9a218b5594d68f843584d251330aaf05':
  Import translations. DO NOT MERGE