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


Trivial merge