[dali_1.2.4] Merge branch 'devel/master' 53/86753/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:26 +0000 (15:02 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:26 +0000 (15:02 +0100)
commit67e706595574ed0fd25385890ed17521f6c3cfde
treecbc7d0c73459ed7f1d4eda9805305314b3f99592
parent26166c0103088bbda019264a91e83a52623798ec
parent1c8ecddfdd7739cb05bba46051628a702048dfd6
[dali_1.2.4] Merge branch 'devel/master'

Change-Id: I8493e27378da6add9f38d0859fa495ad14dc3fd6