[dali_1.1.35] Merge branch 'devel/master' 56/70756/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:09 +0000 (11:18 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:09 +0000 (11:18 +0100)
commit87b87263ddda2188a86217cca356932e36e4cd94
tree5d06f7c40aa524c6d0d35696f3be2dd0dd729cab
parentd873af0fadfeed106af125415442109cc553e30d
parent5e36cbeb5130a253cbe70284ec264159fbe83b30
[dali_1.1.35] Merge branch 'devel/master'

Change-Id: I7971d40e610154e3cce808e3a409023db32edc10