tree 770bf0b4772835e902552cbd9e290811ecdd14c1
parent f92b026431050d499b139e49bee33251cff642a8
parent fa31dd93ca69f1ba058c82f34fe56f60badf50c3
author Eric Fischer <enf@google.com> 1256871607 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256871607 -0700

am fa31dd93: am 84f61027: (-s ours) Import revised translations.  DO NOT MERGE

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

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