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


Trivial merge