tree 567bb75ca54cd71ad69308b0238af6dac0e77de2
parent 916002c8e90079b1a38ab061ac39b15aefea725a
parent 2ba7856545e636e1e3b9337dae6d5cba13b06859
author The Android Open Source Project <initial-contribution@android.com> 1349194877 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349194877 -0700

am 69440026: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6944002679fcffbea28917716f506a2ebfa167b9':
  Perform an orderly shutdown if possible, force disconnect if necessary
  Remove double negatives from SurfaceMediaSource
  Make sure we still handle shutdown-related message even if we're