[dali_1.2.33] Merge branch 'devel/master' 42/122442/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:31:42 +0000 (11:31 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:31:46 +0000 (11:31 +0100)
Change-Id: I96f3f8887814d6813999650dfa210bd3ce946992


Trivial merge