Merge commit '52cb8557525c1b25163cd5e4ad317a7a64119aae' into eclair-mr2-plus-aosp * commit '52cb8557525c1b25163cd5e4ad317a7a64119aae': Remove STOPSHIP comment.
Merge commit '52cb8557525c1b25163cd5e4ad317a7a64119aae' into eclair-mr2-plus-aosp * commit '52cb8557525c1b25163cd5e4ad317a7a64119aae': Remove STOPSHIP comment.