[dali_1.3.9] Merge branch 'devel/master' 41/168441/1
authorUmar <m.umar@partner.samsung.com>
Fri, 26 Jan 2018 14:18:52 +0000 (14:18 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 26 Jan 2018 14:18:52 +0000 (14:18 +0000)
Change-Id: Ic7c7e1a75a8accc29e20c7a7c37674e3fd8841fc


Trivial merge