[dali_1.3.9] Merge branch 'devel/master' 40/168440/1
authorUmar <m.umar@partner.samsung.com>
Fri, 26 Jan 2018 14:18:44 +0000 (14:18 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 26 Jan 2018 14:18:44 +0000 (14:18 +0000)
Change-Id: Ic13b3589a697139fc520e516f7a2a2fe0c70784b


Trivial merge