am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1

* commit 'c97022e7acc6da71e558e9137036622b4c77ca46':
  MtpServer: Do not attempt to stop MTP if it has not been started

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