[dali_1.2.4] Merge branch 'devel/master' 56/86756/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:56 +0000 (15:02 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:56 +0000 (15:02 +0100)
commitbe88883a75560ea10d54849025be429dd44456f6
tree9a1922dfefe670a3a8a9c6efd71a8a031bbf79ac
parentaf9cf1929887c0da0b481a01b2978fcab5e59595
parent280e1b5a3baa7b59925ce9b1b6475a330a7c1252
[dali_1.2.4] Merge branch 'devel/master'

Change-Id: Idfe0ebf0e9c5de4f4d42ba1ae22fa0df21167dd4