tree f0e900d3d2671d56e8003a8324f087737265d536
parent 989523fd44b7dc10deedc926d908ec2c9f035aa7
parent 6819c677b9d8d9a5f60f1a35e045300b1a8aec96
author Eric Fischer <enf@google.com> 1305144553 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305144553 -0700

am 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '6819c677b9d8d9a5f60f1a35e045300b1a8aec96':
  Import revised translations.  DO NOT MERGE