[dali_1.4.23] Merge branch 'devel/master' 78/207578/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 Jun 2019 09:56:37 +0000 (10:56 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 Jun 2019 09:56:37 +0000 (10:56 +0100)
Change-Id: I47e53867fb580cb030d93f8dac45e1d8608f9a4b


Trivial merge