tree 919200ac96ac54548ca1355a6e902aae6c2468c5
parent 26f7404ee691a7b1f2f9fdef7a801b2250df7170
parent 7277848f64806c4d9fdfaf6855b8194669b9be97
author Eric Fischer <enf@google.com> 1258472159 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258472159 -0800

am 7277848f: (-s ours) am a0fdcad4: (-s ours) Merge change I5677c576 into eclair

Merge commit '7277848f64806c4d9fdfaf6855b8194669b9be97'

* commit '7277848f64806c4d9fdfaf6855b8194669b9be97':
  Import revised translations.  DO NOT MERGE