Merge "Don't pass media player to VM playback layout." into mnc-dev
tree: d4c9c69fa2f2ebdc970cb1b1660a28e08b4c812b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags