tree 3f366956f65d433610b52e4c7722a41c45af419e
parent 03202d43d4e52d078c743d05192d40420dbc5b7d
parent e30059fd29b470c152c74ffe64cc1562342f9088
author Eric Fischer <enf@google.com> 1258170515 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258170515 -0800

am e30059fd: am fbb9146f: (-s ours) Merge change I452e3a4c into eclair

Merge commit 'e30059fd29b470c152c74ffe64cc1562342f9088' into eclair-mr2-plus-aosp

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