tree 063776de2f32cba7fda1209ad558fd5ba3f0a5df
parent fc4be14ac63504c660607389de469ab3b9cbd496
parent 498601a89635d24286a1a112062c05d9bbd9e2de
author Eric Fischer <enf@google.com> 1339005977 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339005977 -0700

am 498601a8: (-s ours) am b21b749b: Import translations. DO NOT MERGE

* commit '498601a89635d24286a1a112062c05d9bbd9e2de':
  Import translations. DO NOT MERGE