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


Trivial merge