Merge branch 'develop' of github.com:LiyouZhou/ble into develop

Conflicts:
	ble/services/DFUService.h
This commit is contained in:
Liyou Zhou 2015-11-24 18:35:34 +00:00
commit f31f095879

Diff content is not available