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


Trivial merge