[dali_1.3.48] Merge branch 'devel/master' 60/192360/1
authorRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:43:06 +0000 (11:43 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:43:06 +0000 (11:43 +0000)
commit5e2c2e268ce08921f9293f5fa20fb8331f16b2b9
tree362efdb7dda47d81a1923c6e249c3835856927be
parentc52663f9491be4983c66c0ecd38ce4aafebab5ea
parent2cb8dafa56ba7b34830aea4a813ea1ed0e4f8303
[dali_1.3.48] Merge branch 'devel/master'

Change-Id: Ie1cfe6f15f2e4bcd73df40cd940924a096deecb9