tree 3305d62334a47eb27ec7361ea58e8d392788bf1c
parent 9f49d26ded41676c96289523be75063395a5cf1c
parent 6b1118fc8cfba19e3d4cb57c849212c21cde26d5
author Eric Fischer <enf@google.com> 1256249789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256249789 -0700

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

Merge commit '6b1118fc8cfba19e3d4cb57c849212c21cde26d5' into eclair-mr2-plus-aosp

* commit '6b1118fc8cfba19e3d4cb57c849212c21cde26d5':
  Import revised translations.  DO NOT MERGE