tree 3b859a8217d5108551abbbdb3640d2d1963f6d18
parent e7887046203bda20bda5fe2841f027ed75308490
parent a1f264140f1529000a6bca0e02bc455fd4d67ee2
author Eric Fischer <enf@google.com> 1249343841 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249343841 -0700

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

Merge commit 'a1f264140f1529000a6bca0e02bc455fd4d67ee2'

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