[dali_1.2.61] Merge branch 'devel/master' 67/155567/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:09 +0000 (15:00 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:09 +0000 (15:00 +0100)
commitafa7ce29cc34aa631272ce5569b4298aa00490bf
treeaf20eb88c5f9084d1e526ddbeeb058da94ee0113
parent535b79b009584a50ba73f2a01b553108eefc4488
parent77ccf53cea950bf9911d9e803f87526ccdad10cc
[dali_1.2.61] Merge branch 'devel/master'

Change-Id: I8d2d71824ab618cf71f224392e0e2cfc22956f13