| commit | 9a113060d8a995ad2bdcc02f26bcfe7e24019ae9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:21:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:21:17 2012 -0700 |
| tree | 567bb75ca54cd71ad69308b0238af6dac0e77de2 | |
| parent | 916002c8e90079b1a38ab061ac39b15aefea725a [diff] | |
| parent | 2ba7856545e636e1e3b9337dae6d5cba13b06859 [diff] |
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