my
merge
Merge branch 'master' of https://github.com/SeungSuk/BtCamera.git

Conflicts:
	BtCamera/src/kr/co/rh/btcamera/MainActivity.java