tree 8dc1359d81604bdb5b4777aa34558617e3bd1945
parent c8281fdf0074dc237bb02f0bc1d1d4bbfc036082
parent eb03b6a1f404905c429b089cb0d6a887aae1e97e
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