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


Trivial merge