Merge commit '5648dbb1dabc0231fe953ad45916c067c79986c8' into eclair-plus-aosp * commit '5648dbb1dabc0231fe953ad45916c067c79986c8': DO NOT MERGE: Cleaning up the PipedStreamTest
Merge commit '5648dbb1dabc0231fe953ad45916c067c79986c8' into eclair-plus-aosp * commit '5648dbb1dabc0231fe953ad45916c067c79986c8': DO NOT MERGE: Cleaning up the PipedStreamTest