sharesdk
sharesdk
Merge branch 'master' of https://github.com/pkxiuluo/healthlife.git

Conflicts:
	HealthSLife/res/layout/fragment_heart_rate.xml