[dali_1.0.47] Merge branch 'devel/master' 98/42698/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:29 +0000 (14:19 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:29 +0000 (14:19 +0100)
commitbbc3c52e8f6ec3e679fdea8cc8273c580446897a
tree0aa47ea3c11b56974736b49e232601e31c73a41d
parent9e2bbf21d3595e38f59e3cdd723f2598d7f80efa
parentc60ae206d439b3d84e8fbb76d9d4039dd76358dd
[dali_1.0.47] Merge branch 'devel/master'

Change-Id: Idfb420921d1a4ba7321af334d4310aac55aed742