tree 770bf0b4772835e902552cbd9e290811ecdd14c1
parent 9b2db21536e177ebb2f6b17985f1c1e6f54cd8dd
parent debb302865348492aeb20e9b9b309ba0e24a559a
author Eric Fischer <enf@google.com> 1256229337 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256229337 -0700

am debb3028: am 7204b269: (-s ours) Import revised translations.  DO NOT MERGE

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

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