tree ead15559cff9389c694b7c3c2a677b6d31de33d8
parent fd379524674a3af9d00b7df13bb2f3ed44fd4f90
parent 41ed4478ad9782a1d68de733e4cef8fec0647ef9
author Eric Fischer <enf@google.com> 1260496191 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260496191 -0800

am 41ed4478: am 6799f0f9: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '41ed4478ad9782a1d68de733e4cef8fec0647ef9' into eclair-mr2-plus-aosp

* commit '41ed4478ad9782a1d68de733e4cef8fec0647ef9':
  Import revised translations.  DO NOT MERGE