[dali_1.1.17] Merge branch 'devel/master' 75/57175/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:29 +0000 (14:41 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 15 Jan 2016 14:41:29 +0000 (14:41 +0000)
commitc674e501128288336a09888fb6510ca4a7a8797a
tree9f0044868945a27fb6916da153dda7ae9e0add4e
parente763c0310addba03f301415d7e0d819929126f15
parentfe2116677c43b99d30ffe04b3228afab15e4460e
[dali_1.1.17] Merge branch 'devel/master'

Change-Id: I830f119bf1dd9368a47e9f4095cd36b3eaacd420