[dali_1.4.37] Merge branch 'devel/master' 40/213840/1
authorRichard Huang <r.huang@samsung.com>
Fri, 13 Sep 2019 12:20:17 +0000 (13:20 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 13 Sep 2019 12:20:17 +0000 (13:20 +0100)
Change-Id: Ib094ec57eed4805f2c98ebe330ad944ce3212570


Trivial merge