[dali_1.3.20] Merge branch 'devel/master' 31/175931/1
authoradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:49:44 +0000 (11:49 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:49:44 +0000 (11:49 +0100)
commit366e4edd8bafdcfb257202f96de5330637ab28fd
tree0f6ed60971c6b59fcec9ed418fbe484b3373ce31
parentc987d82026e4acea095e80c4afba70a62efea61c
parent8928813fb057c91497d9ad57c6a580ffe40bd054
[dali_1.3.20] Merge branch 'devel/master'

Change-Id: Ia599a81e1b4fd3ed8ff20dab5b684830bd28f33b