TestRelease
11111
解决冲突
Merge branch 'master' of https://github.com/Zhangzhiyi/Android

Conflicts:
	TestTouchEvent/src/com/et/widget/MyTextView.java