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


Trivial merge