[dali_1.3.46] Merge branch 'devel/master' 78/191578/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 18 Oct 2018 13:27:18 +0000 (14:27 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 18 Oct 2018 13:27:18 +0000 (14:27 +0100)
Change-Id: Idfadb648625997b7ce6afa36827f7c73495e1060


Trivial merge