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


Trivial merge