[dali_1.0.48] Merge branch 'devel/master' 98/43498/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:12:38 +0000 (15:12 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:15:44 +0000 (15:15 +0100)
commitad1313b2bb8ee3449d4faea7340cc8c2fbedf40f
tree036e54f4b3a4d5d391781b756954c3ec29c4bb76
parentbbc3c52e8f6ec3e679fdea8cc8273c580446897a
parent30c0afe47a34fa39c875bf1a022f6114b4e837d2
[dali_1.0.48] Merge branch 'devel/master'

Change-Id: I8cf011d2c88f6a1547393af7a3d7d34951feb9f6