am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair

Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp

* commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99':
  remove an old STOPSHIP comment