tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent d46f31f60cc502c1403fa8210861294b10fe2994
parent 93e416b26a8b49873b9b488e26f603baa044aec8
author Baligh Uddin <baligh@google.com> 1392410178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410178 +0000

am 93e416b2: (-s ours) am fb291f5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '93e416b26a8b49873b9b488e26f603baa044aec8':
  Import translations. DO NOT MERGE