tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 59f7d0fd948313ed9d8eb17d6c025d861c773411
parent 1ca1e4e4d585c2aa09436ff2ec9ea07c8b3e4723
author Baligh Uddin <baligh@google.com> 1392411546 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411546 +0000

am 1ca1e4e4: (-s ours) am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

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