Merge branch 'master' into devel 57/201157/1
authormaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 03:14:42 +0000 (11:14 +0800)
committermaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 03:16:04 +0000 (11:16 +0800)
commita9e5cea68de8d7febaccf0a5c8a09c8a50eb9dc7
tree4d97e01f7323898d0f777e864f5a0746e9f864a7
parent9c5a4bc915f580c66dc356406bb8e6e0f0be73f6
parent67380c8b57f205b4d19dd77ca9318d8c9c55381c
Merge branch 'master' into devel

Change-Id: I99d4e76d7a9f939144f02fc175318e472ebd4c64