[dali_1.1.40] Merge branch 'devel/master' 56/76556/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:49:55 +0000 (08:49 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:50:41 +0000 (08:50 +0100)
commitdf3728ffc062168d593d6a478e6f7583e0ffc336
tree8d772507d23d73e89090c5f57bf4de9b5b2d5b37
parent85a8d2f083ab3660c07098c90e2dc9c05f7c187c
parent04f3ed611c1e1d501940cbfda076c2b13c301832
[dali_1.1.40] Merge branch 'devel/master'

Change-Id: I78056d7051401d24fe5c7e80d5d4b6d15945452c