tree 3305d62334a47eb27ec7361ea58e8d392788bf1c
parent 7f9b5d5651b074da9f4ec8f420e688fa4c8abc4d
parent 9ecb342649cd8931e50034550d5ec29b48b2c129
author Eric Fischer <enf@google.com> 1256263498 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256263498 -0700

am 9ecb3426: (-s ours) am 6b1118fc: am 2875a3cc: (-s ours) Merge change I0ae41e06 into eclair

Merge commit '9ecb342649cd8931e50034550d5ec29b48b2c129'

* commit '9ecb342649cd8931e50034550d5ec29b48b2c129':
  Import revised translations.  DO NOT MERGE