2
Merge branch 'master' of https://github.com/ufo888/singletouch.git

Conflicts:
	SingleTouch/src/com/example/singletouch/SingleTouchActivity.java
	SingleTouch/src/com/example/singletouch/SingleTouchEventView.java
1
1