tree 17a01b8d785326379ea875618e42ef0effd04c37
parent 8ca8f5ed128cd31f0122b9d778e0dd37cb8756c9
parent f3ea02319fc8d1f882ef7f392c245e197ab858de
author Eric Fischer <enf@google.com> 1323733163 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323733163 -0800

am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de':
  Import revised translations.  DO NOT MERGE