tree 79388ee066788a16535f61b7fc9e380fe98c87e5
parent 70ebeb824d61ccc8bbc10bf561a14afef019a409
parent b847f5c644cfa4923b13a8a25252ccfe91c378c5
author Eric Fischer <enf@google.com> 1258137617 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258137617 -0800

am b847f5c6: (-s ours) Merge change I3a308bca into eclair

Merge commit 'b847f5c644cfa4923b13a8a25252ccfe91c378c5' into eclair-mr2

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