a
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git
a) 历史记录显示问题
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git

Conflicts:
	leyu/src/com/ch/leyu/provider/DatabaseHelper.java
	leyu/src/com/ch/leyu/ui/SearchActivity.java
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git

Conflicts:
	leyu/src/com/ch/leyu/provider/DatabaseHelper.java
视频播放界面。