tree cfe6671369711fa372e2bf966a037726ff1833db
parent 10072bb2dfce4ffe91cc4f9339ec2a90e87f56b4
parent ddf25a571ab874bcf937128a987d469338b90c5f
author Andrew Lee <anwlee@google.com> 1434779044 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434779044 +0000

am ddf25a57: am 833686e0: am f3ec8ad5: Merge "Rewrite of MediaPlayer logic." into mnc-dev

* commit 'ddf25a571ab874bcf937128a987d469338b90c5f':
  Rewrite of MediaPlayer logic.