tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 459394de4a5f2bcbf09d8dfb0b76e5a340937294
parent 1b2ee8c1b3a525f02cf2d302744cf4c868985f5c
author Baligh Uddin <baligh@google.com> 1392411186 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411186 +0000

am 1b2ee8c1: (-s ours) am 286ecf1e: (-s ours) Import translations. DO NOT MERGE

* commit '1b2ee8c1b3a525f02cf2d302744cf4c868985f5c':
  Import translations. DO NOT MERGE