Merge branch 'master' into devel 68/201168/1 submit/devel/20190730.052124
authorbiao.wang <biao716.wang@samsung.com>
Mon, 11 Mar 2019 05:34:43 +0000 (13:34 +0800)
committerbiao.wang <biao716.wang@samsung.com>
Mon, 11 Mar 2019 05:36:14 +0000 (13:36 +0800)
commite535acb849489dff2cd475dfb32eda037def260c
treeedac9c551e7e9908ea1e349c752923de9ca633c1
parent6b6ceaacc093bc7e36a354d5ee9659b50836f065
parent1d927fd8c5ad9a933438e7bb15c0af5d9ff72344
Merge branch 'master' into devel

Change-Id: If68ea6ee7ec027a00d1752f490e935c61f0c2f55