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


Trivial merge