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


Trivial merge