Merge branch 'master' into devel 81/201181/1
authorjingui.ren <jingui.ren@samsung.com>
Mon, 11 Mar 2019 07:15:21 +0000 (15:15 +0800)
committerjingui.ren <jingui.ren@samsung.com>
Mon, 11 Mar 2019 07:16:02 +0000 (15:16 +0800)
commit8a47e29c5980a23f2c50b36ccb6ef288185b397d
tree754c4e174cabdd7ae83fcbaf89614ab1549c0a8f
parent820c7a8c255d317311ce93b12a5a4bbe12636f75
parentc554143e8375a43af5689c473c3c6b765b45d2a3
Merge branch 'master' into devel

Change-Id: I2df0a8602e86fb3c705515dbe3a30ec243e6f160
Signed-off-by: jingui.ren <jingui.ren@samsung.com>