[dali_1.2.65] Merge branch 'devel/master' 25/159625/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Nov 2017 07:21:37 +0000 (07:21 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Nov 2017 07:21:37 +0000 (07:21 +0000)
commit5982fcf12fc0f3a21063f02ee432118faa5ca86a
treee650eaf111886fd0f87ee920c287ec9dc013b3a0
parent2cdc15bcda53ce7feff32cd2358cc1f4d943cbfa
parentccd5e67cfebebde79b1c06d8f35ed736ec1de921
[dali_1.2.65] Merge branch 'devel/master'

Change-Id: Ieb3fed1d33b2fa9a096ab75d924c262d6a6d0a2c