tree ec3c03feb82870c58a07aa071a0d5220bfe69be0
parent c5473a46b4b056fb8f6e816489b9796a33f61eee
parent 34df5a5b36bc9848d5a098c889931879b9866cf4
author Baligh Uddin <baligh@google.com> 1392411144 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411144 +0000

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

* commit '34df5a5b36bc9848d5a098c889931879b9866cf4':
  Import translations. DO NOT MERGE