[dali_1.3.42] Merge branch 'devel/master' 84/189884/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Sep 2018 09:19:17 +0000 (10:19 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Sep 2018 09:19:17 +0000 (10:19 +0100)
Change-Id: Ibe36694c436c0012d7ab8b5354f8520e2998a531


Trivial merge