merge master sandbox/wangzhiqiang/private_event
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Fri, 9 Nov 2018 07:02:40 +0000 (15:02 +0800)
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Fri, 9 Nov 2018 07:02:40 +0000 (15:02 +0800)
commit4f1ec5ceb2286cbfc85109f53dd60334368911ba
tree46297cac08431a73bf05b352d3283f3852690590
parent2687a6656112fb5c742bbd722fd7d239cfe52299
merge master

Change-Id: If5f81af8e88729c13806791c19ff72741832bee0
launcher/qml/Launcher.qml