[dali_1.2.4] Merge branch 'devel/master' 54/86754/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:38 +0000 (15:02 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:38 +0000 (15:02 +0100)
commit247281e4128df4903252263c6d86b11dafdd0bb9
treefe742d665ee2126fbadc12abce04425f6bd04ca5
parent3ff4f11343b8021b4656c92f7f2d4d02149fe904
parent6d50da1f3d48d839625a01eb7ee9773ff3e35ec3
[dali_1.2.4] Merge branch 'devel/master'

Change-Id: Ice79d9373b98c56738ea5706c2226efbe7d345c8