[dali_1.2.33] Merge branch 'devel/master' 39/122439/3
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:25:44 +0000 (11:25 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:25:53 +0000 (11:25 +0100)
Change-Id: I055a30c68f33e037a611c30c4e6a5b5afb1f6f99


Trivial merge