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


Trivial merge