[dali_1.3.33] Merge branch 'devel/master' 33/184733/1
authorAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:54 +0000 (13:31 +0100)
committerAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:54 +0000 (13:31 +0100)
commitc794467864b859ab74854f51232c252f413cbea6
treef80803de6bb033b3d4734efe194708d234793817
parentd382897057c4a17889e359db0832d35a80a7f618
parentbcd700494d1991de200be086444ff402c9e1a2d3
[dali_1.3.33] Merge branch 'devel/master'

Change-Id: Iefab1200a2bd64a89316ff1550c2b81051018647