tree e7e96033d6b5c7804875641fcefc47a27af9fe35
parent 3e4db9d861e8c7c80b90bf4fbc8c467c6097c512
parent 42766c4cee2769df178c8bbb2eac9720d016d50f
author Eric Fischer <enf@google.com> 1319734266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319734266 +0000

am 42766c4c: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '42766c4cee2769df178c8bbb2eac9720d016d50f':
  Import revised translations.  DO NOT MERGE