tree 19ab8bca32a31b13d1cd672de84982b6d85cb8d4
parent b1884ebe5d9c97608703065ec446250a874ef588
parent 9ef49eca8122fd8c8933eea1a7d5d489318b6b03
author Baligh Uddin <baligh@google.com> 1442631865 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631865 +0000

am 9ef49eca: (-s ours) Import translations. DO NOT MERGE

* commit '9ef49eca8122fd8c8933eea1a7d5d489318b6b03':
  Import translations. DO NOT MERGE