[dali_1.3.2] Merge branch 'devel/master' 55/162455/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Dec 2017 09:24:01 +0000 (09:24 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Dec 2017 09:24:01 +0000 (09:24 +0000)
Change-Id: Ifccbb638f28fcdaa5272384be94860ab74b2d3cf


Trivial merge