[dali_1.4.23] Merge branch 'devel/master' 80/207580/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 Jun 2019 09:57:00 +0000 (10:57 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 7 Jun 2019 09:57:00 +0000 (10:57 +0100)
Change-Id: I2d3aa0cc4f80ddc5a90e704aba92c6b0d63756b1


Trivial merge