tree 65dea43967ede4c862ad4b950a69bd7613a7def4
parent 87fc88b9ea16a7a7edf857b504e86403c3283c99
parent 31186d0535ce2147e0d094c1409782d0b1aa5ea0
author Eric Fischer <enf@google.com> 1321918158 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321918158 -0800

am 31186d05: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '31186d0535ce2147e0d094c1409782d0b1aa5ea0':
  Import revised translations. DO NOT MERGE