tree 4bfd8492386b27314450e45fdaa53639ef07d2da
parent 523ac9467db3b021c388ba3031b28c53c2b0ce2d
parent 3082585c72856e45dacb0610aa3591fa4d27ddf5
author Baligh Uddin <baligh@google.com> 1443149956 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443149956 +0000

am 3082585c: (-s ours) Import translations. DO NOT MERGE

* commit '3082585c72856e45dacb0610aa3591fa4d27ddf5':
  Import translations. DO NOT MERGE