tree fb50a5f1e1f6b61cc8a8f3ef274b6908fac28ea1
parent f764f247d74c454030a790f6f69a6a64f4086064
parent 31ace0a01cc0d23f00b9de342cc4077dcfb19ff5
author Andrew Lee <anwlee@google.com> 1434145487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434145487 +0000

am 31ace0a0: am 477d4883: Merge "Don\'t pass media player to VM playback layout." into mnc-dev

* commit '31ace0a01cc0d23f00b9de342cc4077dcfb19ff5':
  Don't pass media player to VM playback layout.