tree 3ff69662903627a8212c4a29dd0a44d120977bd5
parent 06ebdaa5a32537b80452ef767683183f588a893f
parent 81d7ee28135139e7f3a97ccad19b78e5880371b0
author Eric Fischer <enf@google.com> 1319840877 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319840877 +0000

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

* commit '81d7ee28135139e7f3a97ccad19b78e5880371b0':
  Import revised translations.  DO NOT MERGE