[dali_1.2.3] Merge branch 'devel/master' 65/85665/1
authorUmar <m.umar@partner.samsung.com>
Fri, 26 Aug 2016 09:28:19 +0000 (10:28 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 26 Aug 2016 09:28:19 +0000 (10:28 +0100)
Change-Id: Id91c87f7a5e12209b1302083589fdd5b512e4773


Trivial merge