am 0460cb9e: am 88cec86e: Remove STOPSHIP and defer removal.
am 0460cb9e: am 88cec86e: Remove STOPSHIP and defer removal.

* commit '0460cb9ed68bbd612c46c52b5f17e58d31cc5125':
  Remove STOPSHIP and defer removal.

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