[dali_1.2.15] Merge branch 'devel/master' 30/98730/1
authorUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:58:55 +0000 (10:58 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:58:56 +0000 (10:58 +0000)
Change-Id: Iac6ae38704a73651c26a6d9c4ff6ea954740377f


Trivial merge