Update
Merge branch 'master' of
https://github.com/stevelaw/MultiSurfaceViewPlayer.git

Conflicts:
	src/com/sample/multisurfacevideoplayer/MainActivity.java