tree df0e5453e15c93c1774aa2ba9cb3eb4db837c1c6
parent 7c40e99c55348d4b9423883b4d1c791152da6bcc
parent 82974b2a33a26eb41d137f0b29484961fd71293a
author Andrew Lee <anwlee@google.com> 1433546564 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433546564 +0000

am 82974b2a: Merge "Don\'t call isPlaying if not prepared." into mnc-dev

* commit '82974b2a33a26eb41d137f0b29484961fd71293a':
  Don't call isPlaying if not prepared.