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


Trivial merge