[dali_1.3.42] Merge branch 'devel/master' 82/189882/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Sep 2018 09:18:56 +0000 (10:18 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Sep 2018 09:18:56 +0000 (10:18 +0100)
Change-Id: Id68c69c9dce56bce1b818f7990d14bff23b012a9


Trivial merge