[dali_1.0.45] Merge branch 'devel/master' 64/41864/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:15:00 +0000 (12:15 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:15:00 +0000 (12:15 +0100)
commit3c6c1b2687725e195b295da9c33cbca6969f1a8a
tree8cae66e944f8a20113f4dfb702ad97dce32fae28
parent9f196dc5277def2810f21871e43ccaedfdaf9198
parent7c8a1db130a7215f54837bfe7850249fc4b058e8
[dali_1.0.45] Merge branch 'devel/master'

Change-Id: I73fe6b49c26c6bbb91b142f1e185941a12bac305