tree b40a009fb79c674e3639160863cde1cd6318d795
parent 5dbf40710a83db775bccf233fcc14815b76fbde6
parent fb2b0ca2dc2f8b2a6a14d2204e8d5e408432a5f3
author Eric Fischer <enf@google.com> 1260496411 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260496411 -0800

am fb2b0ca2: am 9616fc15: (-s ours) Import revised translations.  DO NOT MERGE

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

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