Merge \"Make background black while playing video.\" into nyc-mr1-dev
am: 371d13e393

Change-Id: I6dfc4696be5f35e1e29b7706cd73b0f274fedc37
tree: 338ff647ff636816163606a901f609acc395759b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml