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


Trivial merge