[dali_1.4.10] Merge branch 'devel/master' 18/201118/1
authorDaniel McEwen <d.mcewen@partner.samsung.com>
Fri, 8 Mar 2019 11:30:02 +0000 (11:30 +0000)
committerDaniel McEwen <d.mcewen@partner.samsung.com>
Fri, 8 Mar 2019 11:30:02 +0000 (11:30 +0000)
Change-Id: I0a916eaace49dd95b471c304b78d800f72a48e72


Trivial merge