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


Trivial merge