tree ec3c03feb82870c58a07aa071a0d5220bfe69be0
parent cc7fe0431206b8773c6c503f575a48013bbbaa8a
parent 7e638c722830ed05a2aa17fc1fc02d7842b8103d
author Baligh Uddin <baligh@google.com> 1392411606 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411606 +0000

am 7e638c72: (-s ours) am 34df5a5b: (-s ours) am a678d906: (-s ours) am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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