c
Merge branch 'master' of https://github.com/luchunminglu/android

Conflicts:
	AndroidMain/src/cmlu/android/utils/SqlLiteHelper.java