Merge "Put a black View in front of SurfaceView." into jb-dev
tree: 54d546555ece4647dbfb5a688c8498cd08d54d33
  1. res/
  2. src/