[dali_1.3.32] Merge branch 'devel/master' 65/184065/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Jul 2018 08:49:18 +0000 (09:49 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Jul 2018 08:49:18 +0000 (09:49 +0100)
Change-Id: I12f89878a215ca845925f060230fcbf4d520bf47


Trivial merge