[dali_1.3.38] Merge branch 'devel/master' 88/187488/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:54 +0000 (15:03 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:54 +0000 (15:03 +0100)
Change-Id: I788ec3342fdec1fa103ea69e92c25d2cc3ea4b1e


Trivial merge