[dali_1.3.26] Merge branch 'devel/master' 77/180077/1
authorthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:19:36 +0000 (14:19 +0100)
committerthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:19:36 +0000 (14:19 +0100)
Change-Id: I8f7372afbc13847f18e87757150d0e0ff0bf6a00


Trivial merge