tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent ecad1b10a7bd89e7274e90fd9cc0bcfdce54e9c7
parent 0ed8331d3ee603e89fed2f3064cb3e5f3f9bcbf0
author Baligh Uddin <baligh@google.com> 1392410108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410108 +0000

am 0ed8331d: (-s ours) am 4c38d175: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '0ed8331d3ee603e89fed2f3064cb3e5f3f9bcbf0':
  Import translations. DO NOT MERGE