[dali_1.4.36] Merge branch 'devel/master' 80/213480/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 5 Sep 2019 14:28:02 +0000 (15:28 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 5 Sep 2019 14:28:02 +0000 (15:28 +0100)
Change-Id: I160d5c1bcf0b3cfdd5ae6224df87f87925c8a43e


Trivial merge