tree f7f68b718a3a190862a21b9eb9b6b459d9fb96bf
parent 05c786c29661d6c2a799f719eb6ffef7d3249101
parent 7aa6b3f025bfab50ab510690490bd9d5a91fe8e8
author Eric Fischer <enf@google.com> 1322602370 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322602370 -0800

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

* commit '7aa6b3f025bfab50ab510690490bd9d5a91fe8e8':
  Import revised translations.  DO NOT MERGE