tree 986125769dcc5027cf2b56e72e034af35f60d8a1
parent c4cffe7a4323f11c7f47aafd0b9bac1d4863f12f
parent 6fe22531fb81846a1ab69fa1b614e56562841943
author Eric Fischer <enf@google.com> 1321537544 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537544 -0800

am 6fe22531: (-s ours) am b655d545: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '6fe22531fb81846a1ab69fa1b614e56562841943':
  Import revised translations.  DO NOT MERGE