[dali_1.2.33] Merge branch 'devel/master' 41/122441/3
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 11:00:52 +0000 (12:00 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 11:00:52 +0000 (12:00 +0100)
Change-Id: Iac9e1f1c774441a6ab054477d3e8d326bcaa1174


Trivial merge