tree 4d103ee95c329223f25ad4b6b1d373207eb92903
parent 6d93ea74956277142213c5cf12b1eb5814ba7b7e
parent 148d5bd855e4872bbe99870b0019462bcf73b72c
author Eric Fischer <enf@google.com> 1319237874 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319237874 -0700

am 148d5bd8: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '148d5bd855e4872bbe99870b0019462bcf73b72c':
  Import revised translations.  DO NOT MERGE