tree 919200ac96ac54548ca1355a6e902aae6c2468c5
parent fcc9bd4179df7c3c41982c51d6e90e531132d90e
parent a0fdcad4e34cdddff337f5b4c2c354fd97226ad1
author Eric Fischer <enf@google.com> 1258430082 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258430082 -0800

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

Merge commit 'a0fdcad4e34cdddff337f5b4c2c354fd97226ad1' into eclair-mr2

* commit 'a0fdcad4e34cdddff337f5b4c2c354fd97226ad1':
  Import revised translations.  DO NOT MERGE