Merge branch 'master' into devel 97/201197/1 submit/devel/20190730.075352
authormaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:30:51 +0000 (16:30 +0800)
committermaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:31:28 +0000 (16:31 +0800)
commit3a64fc78cb1b054fa06c6c63584a9c4ca296406b
treed2bd3ca6b24b2958170f470b94a3ea4e9e758f0f
parent334f4b6d3508f425862ae3a14796df5bfdebba9d
parent36b1d6b0de9e55d1f32ccb8a4fa6512f6becf52e
Merge branch 'master' into devel

Change-Id: I8e425b9db7eb1f7c82c43d92bae17ba879b433ee