[dali_1.2.33] Merge branch 'devel/master' 40/122440/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:29:00 +0000 (11:29 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:29:10 +0000 (11:29 +0100)
Change-Id: I4b4381e8d419d1de776412ac970de029387734bd


Trivial merge