12345
Merge http://github.com/lixingji/MyView

Conflicts:
	src/com/example/myview/MainActivity.java