Merge branch 'master' into devel 93/201193/1 devel master submit/devel/20190730.075423 submit/trunk/20190927.012743
authormaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:11:16 +0000 (16:11 +0800)
committermaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:11:59 +0000 (16:11 +0800)
commitf513cc961dfc7a2ab787cebf4d70af91bf956b82
tree68b8f49d56b368fb5b4dbc1e73858d156af5d82f
parent215f63197551b15f4c35e6dcf22f34bb1e3c8d3f
parentd7520cfc5891b687192a6d1090a7c62fb0d0afb5
Merge branch 'master' into devel

Change-Id: I4c9272b3a7f48481da93d545c448302238e59cb8