tree 8d003d12046c5f6b8bae04c47da3c5ddc41b15df
parent 1e303bb7d2ec6e531c93832a02050d9c8d79b9c5
parent 558a3c412922726416bdb4430d2079da4a390688
author Eric Fischer <enf@google.com> 1259796061 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259796061 -0800

am 558a3c41: am 9b8b1ef9: (-s ours) Merge change If84681a3 into eclair

Merge commit '558a3c412922726416bdb4430d2079da4a390688' into eclair-mr2-plus-aosp

* commit '558a3c412922726416bdb4430d2079da4a390688':
  Import revised translations.  DO NOT MERGE