[dali_1.1.40] Merge branch 'devel/master' 59/76559/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:53:34 +0000 (08:53 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:54:10 +0000 (08:54 +0100)
commit18ed895cb14acd1a86efe58127a8a5880ff8a51f
treeca4df4a9f79372089ee4a13c4c306ea7774f0ab3
parenta3b9cfa45075d7a7e1649729d783d68659ed4626
parent5f0157d9ec359e3b6c49b69ac0061d8216633a68
[dali_1.1.40] Merge branch 'devel/master'

Change-Id: Ib300a2a65815251cbfcaf84c3c1fc151064d9d8f