tree 042936a8fd97cd49931a9128a29a9a8c635ff619
parent 6af1d81f26015dc648fc8b6776b5a48b64170e1b
parent f3a4562e4a4af9f2cec3e98a8a01f5d50acba235
author Eric Fischer <enf@google.com> 1320698745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320698745 +0000

am f3a4562e: am 6c53e555: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

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