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


Trivial merge