tree 3690b5e55e40dfdf94407d41d60df486722fe1c8
parent f60527a3ea097d9a7ae8bfba135ec3c615060261
parent 865e2772ae721ec44737d69d1ff596cfc7832204
author Eric Fischer <enf@google.com> 1318963143 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963143 -0700

am 865e2772: (-s ours) am dc091f5d: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '865e2772ae721ec44737d69d1ff596cfc7832204':
  Import revised translations.  DO NOT MERGE