tree df8087ae6fe1c771d53dbadb4389ecf2d016e7d4
parent ed74d9c525112e35931dc3521bd951ddb9083cfd
parent 1b1928715253e74a5a782463907f93bdf7de52c4
author Robert Shih <robertshih@google.com> 1437842909 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437842909 +0000

am 1b192871: am b45cb776: Merge "Explicitly disconnect in MediaPlayer::reset" into mnc-dev

* commit '1b1928715253e74a5a782463907f93bdf7de52c4':
  Explicitly disconnect in MediaPlayer::reset