dd
dd
Merge pull request #41 from suntinghui/master

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

Conflicts:
	res/drawable-hdpi/nodata.png
	res/drawable-mdpi/nodata.png
Merge pull request #58 from liaojia/master

LJ