[dali_1.4.7] Merge branch 'devel/master' 04/199804/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 14 Feb 2019 14:07:55 +0000 (14:07 +0000)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 14 Feb 2019 14:07:55 +0000 (14:07 +0000)
Change-Id: Ica1fd3b299f43f17a969e72b3a5ad1f0c944d873


Trivial merge