tree 359528e8d8c2f858cb7f1c863aaeb52a778de63c
parent af8532d79c0eaae744d34513c75fdd3711423996
parent 71273c74876cf9b8d893bf27befee5f59895a1f8
author Eric Fischer <enf@google.com> 1297881759 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297881759 -0800

am 71273c74: (-s ours) am 00bcdb36: Import revised translations.  DO NOT MERGE

* commit '71273c74876cf9b8d893bf27befee5f59895a1f8':
  Import revised translations.  DO NOT MERGE