[dali_1.2.44] Merge branch 'devel/master' 35/134435/1
authorUmar <m.umar@partner.samsung.com>
Fri, 16 Jun 2017 11:04:03 +0000 (12:04 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 16 Jun 2017 11:04:03 +0000 (12:04 +0100)
Change-Id: Ie75ace94293249c1d82d38974ccac8152f897d60


Trivial merge