[dali_1.3.9] Merge branch 'devel/master' 42/168442/1
authorUmar <m.umar@partner.samsung.com>
Fri, 26 Jan 2018 14:19:09 +0000 (14:19 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 26 Jan 2018 14:19:09 +0000 (14:19 +0000)
Change-Id: I8642f2aa42d53db1044a8dac28a1465af12adbbf


Trivial merge