tree 8b7f13bfe63a042395eab149129608a75e403590
parent a6fb82bbbfd92625a16e0b998e49550740b130ea
parent f4a4cc85920596bb15eeee002f9c8897358c2f2e
author Eric Fischer <enf@google.com> 1296321498 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296321498 -0800

am f4a4cc85: (-s ours) am 3b80e51f: (-s ours) am f7be630c: Import revised translations.  DO NOT MERGE

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