tree 7aa1ce39b517991db26398c62bc30253aca0f19f
parent 2391d860e9f57102143d6188c75f343ed92e9088
parent dfc0992233ddcef3851a0b2566d8bbc2c9dfa4e0
author Eric Fischer <enf@google.com> 1321470140 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321470140 -0800

am 7dc81e06: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '7dc81e06e4d0554683595e8d2e318837548e249a':
  Import revised translations.  DO NOT MERGE