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


Trivial merge