[dali_1.4.42] Merge branch 'devel/master' 26/216026/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 18 Oct 2019 10:13:50 +0000 (11:13 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 18 Oct 2019 10:13:50 +0000 (11:13 +0100)
Change-Id: I585e1a262d83bc52819d465d4238c3cd762af0d1


Trivial merge