[dali_1.2.15] Merge branch 'devel/master' 33/98733/1
authorUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:59:26 +0000 (10:59 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:59:26 +0000 (10:59 +0000)
Change-Id: If38951299ed9e878247ee3e38c0d5db166ccf473


Trivial merge