[dali_1.3.26] Merge branch 'devel/master' 74/180074/1
authorthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:18:58 +0000 (14:18 +0100)
committerthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:18:58 +0000 (14:18 +0100)
Change-Id: Ie9802cbf58c85ad2a1478550b20f2da702db4a22


Trivial merge