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


Trivial merge