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


Trivial merge