tree a7502118c6abd0c1aa64eba593b5e63aba3715fa
parent 9abaf184275c13974699cda848cdac47e1c2dd9a
parent 973c0ad411ebe334b1d8434ddd6dca6996a3b885
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