lj
iMerge branch 'master' of git@github.com:liaojia/LKOA4Android.git

Conflicts:
	src/com/lkoa/activity/LoginActivity.java
下载更新