tree 3305d62334a47eb27ec7361ea58e8d392788bf1c
parent 043c6737165ea8071a290ab7e9e01dac17935b9f
parent 2875a3cc9eb2aa69a31ec494852cf866bb189bd7
author Eric Fischer <enf@google.com> 1256249498 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256249498 -0700

am 2875a3cc: (-s ours) Merge change I0ae41e06 into eclair

Merge commit '2875a3cc9eb2aa69a31ec494852cf866bb189bd7' into eclair-mr2

* commit '2875a3cc9eb2aa69a31ec494852cf866bb189bd7':
  Import revised translations.  DO NOT MERGE