[dali_1.0.48] Merge branch 'devel/master' 97/43497/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:12:07 +0000 (15:12 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:14:59 +0000 (15:14 +0100)
commit7bbffec38a0660daa48a52de48e7fd8e12e923c1
tree373bf21335831ad5bf1f69b42cef573b541d4246
parentadc926dbb6442d4d24ac8182a63269dfa9525b5a
parent04019ce864d37f31622d02631583719b6ba07681
[dali_1.0.48] Merge branch 'devel/master'

Change-Id: I2ac98c2a051016180e16bd97eb5cf98d52754f85