的股份
Merge branch 'master' of https://github.com/demonwang/HFADSDk

Conflicts:
	AndroidManifest.xml