[dali_1.1.25] Merge branch 'devel/master' 78/61978/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:03:03 +0000 (15:03 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:03:03 +0000 (15:03 +0000)
commit19fc46e83efacca0365add51adddcda880689b8f
tree884301eef25ee479985ad6a1eae6e890bc37cd22
parentee564d6d42e82c1d182c350e158025c76ff4d4c5
parent5b3db0b8ae60693ce24d709bbec88e066cb57bdf
[dali_1.1.25] Merge branch 'devel/master'

Change-Id: I2dc739829701f72cd17b71de5c9d4c83d2935842