[dali_1.2.35] Merge branch 'devel/master' 98/124998/1
authorUmar <m.umar@partner.samsung.com>
Thu, 13 Apr 2017 09:14:21 +0000 (10:14 +0100)
committerUmar <m.umar@partner.samsung.com>
Thu, 13 Apr 2017 09:14:21 +0000 (10:14 +0100)
Change-Id: I00222685c5a9625fdc474ead1290f9900c146217


Trivial merge