tree 20b336c7422d0e0838475179d67cbe24fec83fc7
parent 4502636629ebb3f2ebb8521241c364666d1d7345
parent 11473332b4df78610ebb903e255d69ab35e5bf59
author Mike Lockwood <lockwood@android.com> 1300372004 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300372004 -0700

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

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