kao qin yu jing
Signed-off-by: ping.zhang <zhangping@qq.com>
Merge branch 'zhangping_dev_002' of https://github.com/andyiac/AndroidAppYuJing.git

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml

Signed-off-by: ning.Zhang <ning.zhang@inno-optics.com>