tree e2c326236def6fdad550bf49f03024a1360075af
parent 1b4890c96898ee9e66380a5513c88f858bbd0dc3
parent c97022e7acc6da71e558e9137036622b4c77ca46
author Mike Lockwood <lockwood@android.com> 1300372106 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300372106 -0700

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