dd
dd
Merge branch 'master' of github.com:liaojia/LKOA4Android

Conflicts:
	res/drawable-hdpi/nodata.png
	res/drawable-mdpi/nodata.png