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

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

Merge commit '84f61027e16cf75567bd9fd3fa591931158981bf' into eclair-mr2

* commit '84f61027e16cf75567bd9fd3fa591931158981bf':
  Import revised translations.  DO NOT MERGE