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


Trivial merge