[dali_1.4.22] Merge branch 'devel/master' 70/207270/1
authoradam.b <adam.b@samsung.com>
Fri, 31 May 2019 09:52:37 +0000 (10:52 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 31 May 2019 09:52:37 +0000 (10:52 +0100)
Change-Id: Ic94c9889e29e7a222d1c7b1894d16fdb45173a40


Trivial merge