tree 37f2e46c0c8f958f02fead2dec7a51f09884dbfc
parent f6ac83bef9b75f2a7f0f0a5af783ed54fb5afb39
parent 132b23f84905060163be6a30d718074cd4e1770d
author Mike Lockwood <lockwood@android.com> 1300372253 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300372253 -0700

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

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