[dali_1.4.8] Merge branch 'devel/master' 97/200397/1
authorDavid Steele <david.steele@samsung.com>
Fri, 22 Feb 2019 14:33:24 +0000 (14:33 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 22 Feb 2019 14:33:24 +0000 (14:33 +0000)
Change-Id: I21818e983eb5e4dbdaadde68681286ac39a0fec6


Trivial merge