moreee
Merge branch 'master' of https://github.com/fls4507/com.example.cameraexample

Conflicts:
	CameraExample/src/com/example/cameraexample/MainActivity.java