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


Trivial merge