[dali_1.9.14] Merge branch 'devel/master' 97/234897/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2020 11:18:45 +0000 (12:18 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 May 2020 11:18:45 +0000 (12:18 +0100)
Change-Id: I00ee27ff42e225d2cabcbbb0ac738c40fac5c3af


Trivial merge