tree d7592713e97d30def1175644f5c22f639cef521b
parent bf28a31620a9068efd8621196a24dc9f767fc08a
parent 63bcfb77e03cb64c9dda9d74397c70c024c2ac40
author Eric Fischer <enf@google.com> 1319230883 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319230883 -0700

am 63bcfb77: (-s ours) am 442b5325: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '63bcfb77e03cb64c9dda9d74397c70c024c2ac40':
  Import revised translations.  DO NOT MERGE