am b29553e5: am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0
am b29553e5: am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0

* commit 'b29553e5b00c0ef4cde959783ac5563d178537d3':
  Check MediaPlayer state, do not teardown() from UI thread.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base