tree 48b1dcdeb365e118e1a050a33e5c86f6fd54103a
parent fdfdda9247ee73bd02e5eca3144ee753ec27a931
parent dc091f5d85b2d069fda545d8450269c3bc75615e
author Eric Fischer <enf@google.com> 1318962988 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318962988 -0700

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

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