[dali_1.3.37] Merge branch 'devel/master' 55/187055/1
authorthothamon <jason.perry@partner.samsung.com>
Fri, 17 Aug 2018 11:17:04 +0000 (12:17 +0100)
committerthothamon <jason.perry@partner.samsung.com>
Fri, 17 Aug 2018 11:17:04 +0000 (12:17 +0100)
Change-Id: I9015ff3f92290cc87b0cc9363dc4b5eea6a8076a


Trivial merge