[dali_1.1.40] Merge branch 'devel/master' 55/76555/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:47:15 +0000 (08:47 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:47:40 +0000 (08:47 +0100)
commit1fc5628ebab42017caf36e668abebb1b31ca281d
tree2b8fe2cf2b23b97f881d05795df3708b65b13df8
parent3d64028b759662e0f0d6aa159755066a3b83a281
parent42bed4f035a2d543721191099dc97d93919d2b2f
[dali_1.1.40] Merge branch 'devel/master'

Change-Id: I9752c3dd14f0266c08927c29efd1c4ceffd67d2e