am 8158980b: am 441b80ab: am 6b4bd260: Merge change I1cd5c828 into eclair

Merge commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3'

* commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3':
  change the way bytes are read from InputStream.