tree 930c1a9981b73b54e378bc9a9e14953d01fbc48b
parent 5a7eab20b748f76af8201f134ce87c646f6484f3
parent ef98d583e00474a07b2dd8ccdca420ade60d9fe2
author Eric Fischer <enf@google.com> 1258163540 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258163540 -0800

am ef98d583: am 196895b9: (-s ours) Import revised translations.  DO NOT MERGE

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

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