am 80312972: (-s ours) am feb9a2c6: Merge from open-source gingerbread - do not merge

* commit '8031297202239c19ee43d34d467af25b90a07479':
  Fix a decoding problem on the Email body
This commit is contained in:
Jean-Baptiste Queru 2011-02-02 08:03:33 -08:00 committed by Android Git Automerger
commit 5e1fa60708

Diff Content Not Available