[dali_1.2.35] Merge branch 'devel/master' 03/125003/1
authorUmar <m.umar@partner.samsung.com>
Thu, 13 Apr 2017 09:23:18 +0000 (10:23 +0100)
committerUmar <m.umar@partner.samsung.com>
Thu, 13 Apr 2017 09:23:18 +0000 (10:23 +0100)
Change-Id: I0c9b9d5a59038e68c0b3dd0025a68d0f8fce4b36


Trivial merge