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


Trivial merge