tree ab8eba8da376b1380bf43901cccf7d38bf21da25
parent 9974550d60a7fa13390e2c1345f486a298a7e639
parent f54d7a2c924b2d1060a89ac398f57a58e3e581d1
author Eric Fischer <enf@google.com> 1258430757 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258430757 -0800

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

Merge commit 'f54d7a2c924b2d1060a89ac398f57a58e3e581d1' into eclair-mr2-plus-aosp

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