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


Trivial merge