tree 6ef6490ed91771f1566a50e19d60b689f4e6e762
parent 0880475a4ade869fba11069ccc8264112a46b637
parent fb95298f47388589752d0daa6bded568b7898864
author Eric Fischer <enf@google.com> 1258170627 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258170627 -0800

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

Merge commit 'fb95298f47388589752d0daa6bded568b7898864'

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