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


Trivial merge