merge improvement
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Mon, 14 Jan 2019 05:50:55 +0000 (13:50 +0800)
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Mon, 14 Jan 2019 05:50:55 +0000 (13:50 +0800)
commitd6140dad95f7884f8a7a666a125c1b24065d2c60
treea301d503c528f0278aa6b23090de298cff57fdbd
parent8788711b78485032f334939d8d3ddfc319189cd2
parent0558bdbf99233fb2391ba32cc91ec126e1ca6c1a
merge improvement

Change-Id: I555f0e48ff96564695af60e8d2dbbc1379a8bc95
src/homescreen.cpp
src/hs-client.cpp
src/hs-client.h
src/hs-clientmanager.cpp
src/hs-clientmanager.h
src/hs-periphery.cpp
src/hs-periphery.h