[dali_1.4.28] Merge branch 'devel/master' 40/209940/1
authorRichard Huang <r.huang@samsung.com>
Fri, 12 Jul 2019 10:18:56 +0000 (11:18 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 12 Jul 2019 10:18:56 +0000 (11:18 +0100)
Change-Id: If75de4ed4ff3bdf3e9cc6022a4475bb98e18f5ae


Trivial merge