[dali_1.0.45] Merge branch 'devel/master' 62/41862/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:14:47 +0000 (12:14 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:14:47 +0000 (12:14 +0100)
commit8251c7755e239de90b099e768e8143c4a405adec
tree94b603f628d91e22c0bda32a7c1a9fb8f49811df
parent2ee5475f5fb3651170440fa16a4dd4a8fa3b5298
parent8fbb722b51bff18f2c1359a449156e2e5ca9c132
[dali_1.0.45] Merge branch 'devel/master'

Change-Id: Ia30f7e9c898c6137274819c0011e9783f635532e