[dali_1.2.55] Merge branch 'devel/master' 19/147219/1
authorUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:05 +0000 (12:36 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:05 +0000 (12:36 +0100)
Change-Id: Ib3e6aaf54176c982ce6a51511677018b644a6e21


Trivial merge