tree 2ad7f90aa182e7a69b01cc4e9c15dce41eddb8b7
parent fb07a6ab673ff3bbbcde27bd226c8fcb4bfe5aa7
parent 33cd5b9e9ecc541f4966a0d285296fb53447fdf4
author Baligh Uddin <baligh@google.com> 1392410324 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410324 +0000

am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '33cd5b9e9ecc541f4966a0d285296fb53447fdf4':
  Import translations. DO NOT MERGE