[dali_1.3.17] Merge branch 'devel/master' 45/173745/1
authorUmar <m.umar@partner.samsung.com>
Fri, 23 Mar 2018 13:41:35 +0000 (13:41 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 23 Mar 2018 13:41:35 +0000 (13:41 +0000)
Change-Id: I2f88f8b00f105bbc9047ac2cffac5f53e1f19cc1


Trivial merge