[dali_1.4.25] Merge branch 'devel/master' 57/208257/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 20 Jun 2019 10:21:44 +0000 (11:21 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 20 Jun 2019 10:21:44 +0000 (11:21 +0100)
Change-Id: I1aae8a85d1df0792626a5de6e63630cdeb347322


Trivial merge