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


Trivial merge