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

am 7c3fe394: (-s ours) am e6b93f95: (-s ours) am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf

* commit '7c3fe3947d3c52a06d34f7b9e23cbc9c14fb8b32':
  Import translations. DO NOT MERGE