am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."
am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."

Merge commit '43f2b4e9c6811e0411446336ac4118565aa8eb88' into eclair-mr2-plus-aosp

* commit '43f2b4e9c6811e0411446336ac4118565aa8eb88':
  Revert "Remove STOPSHIP comment."

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base