[dali_1.4.15] Merge branch 'devel/master' 21/203421/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Apr 2019 10:49:21 +0000 (11:49 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Apr 2019 10:49:21 +0000 (11:49 +0100)
Change-Id: Ib5cff96328d4cd42a479be17ca5234784f868abb


Trivial merge