tree 0334aca65bfa0de3eaf4883d235aeb298b902c58
parent a6f64107ac92386bb2ee4d6f2c45ffa1f46011be
parent 46a5604858cd35093b47da3ffdac471dd146f994
author Eric Fischer <enf@google.com> 1259815191 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259815191 -0800

am 46a56048: (-s ours) am 558a3c41: am 9b8b1ef9: (-s ours) Merge change If84681a3 into eclair

Merge commit '46a5604858cd35093b47da3ffdac471dd146f994'

* commit '46a5604858cd35093b47da3ffdac471dd146f994':
  Import revised translations.  DO NOT MERGE