[dali_1.4.8] Merge branch 'devel/master' 93/200393/1
authorDavid Steele <david.steele@samsung.com>
Fri, 22 Feb 2019 14:32:47 +0000 (14:32 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 22 Feb 2019 14:32:47 +0000 (14:32 +0000)
Change-Id: I957c37f131e0e22506ea813053b9cde022224bc9


Trivial merge