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


Trivial merge