am 1067c3cb: Merge change Ia5ef9acd into eclair

Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
This commit is contained in:
Fred Quintana 2009-12-07 17:04:40 -08:00 committed by Android Git Automerger
commit eb23b2c678

Diff Content Not Available