study package
Merge branch 'master' of https://github.com/zwbn57175596/zhaowei

Conflicts:
	HelloNN/AndroidManifest.xml
	HelloNN/pom.xml