tree 9e11a5b07fed34b974124880b94f4fe0fc38eb05
parent 67d90e9d46aa9f26472861e48c69c8e8a28ece21
parent 0e2a846d575c8f4c92d499336959ef4f2cd82c81
author Eric Fischer <enf@google.com> 1258137767 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258137767 -0800

am 0e2a846d: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '0e2a846d575c8f4c92d499336959ef4f2cd82c81' into eclair-mr2

* commit '0e2a846d575c8f4c92d499336959ef4f2cd82c81':
  Import revised translations.  DO NOT MERGE