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


Trivial merge