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


Trivial merge