冲突
Merge branch 'master' of
git@github_work:tclSmartwatch/tcl_smartwatch.git

Conflicts:
	Watch/src/com/tcl/watch/ui/MainActivity.java
Merge branch 'master' of
git@github_work:tclSmartwatch/tcl_smartwatch.git

Conflicts:
	Watch/src/com/tcl/watch/ui/MainActivity.java