tree 310d870bb2c87009b6a21c10e233f9489770b6fc
parent 9891b26b25363d1abe71a8b59232430e6abeaca0
parent 88842020e75b8e1fd76ce18c2f486636e36af0b4
author Eric Fischer <enf@google.com> 1319654063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319654063 +0000

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

* commit '88842020e75b8e1fd76ce18c2f486636e36af0b4':
  Import revised translations.  DO NOT MERGE