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


Trivial merge