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.
tree: fb50a5f1e1f6b61cc8a8f3ef274b6908fac28ea1
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags