tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 7c3fe3947d3c52a06d34f7b9e23cbc9c14fb8b32
parent 62a708f4e81b3a1565d977607d870adb9c410083
author Baligh Uddin <baligh@google.com> 1392411184 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411184 +0000

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 '62a708f4e81b3a1565d977607d870adb9c410083':
  Import translations. DO NOT MERGE