Merge branch 'master' of ssh://gerrit.automotivelinux.org:29418/apps/homescreen
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Thu, 24 Jan 2019 09:14:56 +0000 (17:14 +0800)
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Thu, 24 Jan 2019 09:14:56 +0000 (17:14 +0800)

Trivial merge