tree 8b7f13bfe63a042395eab149129608a75e403590
parent 443926ff8c16baa828c25855f223b8262c804f36
parent b6422e1efb6064faa0204c49a1a11d05d8daece5
author Eric Fischer <enf@google.com> 1296319099 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296319099 -0800

am b6422e1e: (-s ours) am 4a2e6b38: (-s ours) am d8c14af3: Import revised translations.  DO NOT MERGE

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