[dali_1.2.35] Merge branch 'devel/master' 05/125005/1
authorUmar <m.umar@partner.samsung.com>
Thu, 13 Apr 2017 09:26:32 +0000 (10:26 +0100)
committerUmar <m.umar@partner.samsung.com>
Thu, 13 Apr 2017 09:26:32 +0000 (10:26 +0100)
Change-Id: I884ba8d0ca9f9d530ee66f778b4519838d652fde


Trivial merge