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


Trivial merge