[dali_1.4.31] Merge branch 'devel/master' 04/211404/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 2 Aug 2019 10:27:27 +0000 (11:27 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 2 Aug 2019 10:27:27 +0000 (11:27 +0100)
Change-Id: I20b47d01a2a9d98330c3fd2043d6557b4cd22cf0


Trivial merge