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


Trivial merge