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

am 459394de: (-s ours) am 62a708f4: (-s ours) am 339e0c19: (-s ours) am 3be0912b: (-s ours) am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '459394de4a5f2bcbf09d8dfb0b76e5a340937294':
  Import translations. DO NOT MERGE