tree ab8eba8da376b1380bf43901cccf7d38bf21da25
parent 715bdfb52bf4c168c8147ce645029fa18df6b9e1
parent a3cf93a2e7d936375db59628809bc2e20d5ba240
author Eric Fischer <enf@google.com> 1258430036 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258430036 -0800

am a3cf93a2: (-s ours) Merge change I3ff67703 into eclair

Merge commit 'a3cf93a2e7d936375db59628809bc2e20d5ba240' into eclair-mr2

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