tree 95f35e36562f610b42f749778a97ed4700b137f2
parent 69f3ad88adcbcfcbbb8b25090faaca676711428a
parent f63e8f3be1fe9b124977efed8f75e886dc434151
author Eric Fischer <enf@google.com> 1255048512 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255048512 -0700

am f63e8f3b: (-s ours) am 5bd1f9e8: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'f63e8f3be1fe9b124977efed8f75e886dc434151' into eclair-mr2

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