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

* commit '6a0ba62d864d08223c09fe48b05497ee663443b1':
  Don't pass media player to VM playback layout.
tree: 1006e82b2e84d1da95186e7d0fc646d28dc39e1e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags