[dali_1.1.25] Merge branch 'devel/master' 77/61977/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:02:58 +0000 (15:02 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:02:58 +0000 (15:02 +0000)
commitbbf759d839e4b57d2f4f0a8d4652eaa44714907b
tree92dd238f43b65855899ca7b9fe50dd0beaa39e0f
parent21ad0307d423d39fd376eafd67fb4963c0f040cc
parentdb47b8b180c94e21d2a162cdca50838221a8fda8
[dali_1.1.25] Merge branch 'devel/master'

Change-Id: Iee2438bfeaee5afb254db11731fe6f1a2c5a0db7