tree 9e53369901971246025c286e02f8c0236153d2d7
parent c3579bc065526fe4b68d03498977f700e52365e3
parent 132ab8dc2263d264998a978e7aa067b646b2a46f
author Eric Fischer <enf@google.com> 1299794040 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299794040 -0800

am 132ab8dc: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '132ab8dc2263d264998a978e7aa067b646b2a46f':
  Import revised translations.  DO NOT MERGE