tree 30fbfeb62560c8503a6f8e32e9624c129f98c194
parent b42085e004aa04c2701bc8e7447317f9956272db
parent b59489aa342d6e979cf24d9de336fd1b6952c11c
author Eric Fischer <enf@google.com> 1281033841 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281033841 -0700

am c1b387ae: (-s ours) am d89443d8: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3'

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