[dali_1.3.2] Merge branch 'devel/master' 54/162454/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Dec 2017 09:23:53 +0000 (09:23 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Dec 2017 09:23:53 +0000 (09:23 +0000)
Change-Id: Ie7a94dab1f525143eff4f42a70256be115b0f733


Trivial merge