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


Trivial merge