[dali_1.3.47] Merge branch 'devel/master' 95/191995/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:25:13 +0000 (12:25 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:25:13 +0000 (12:25 +0100)
commit9bfd11632f015e5b792bb15e1b515942cbc173d4
tree8a32bb02d874228a981af6bda5e637420bbd76de
parentb0d5bdccc3061b10c3114c6ac4e82a8750c3e493
parent2fa0b3c7b37286d4f23d8f0eb26047d49c5c2416
[dali_1.3.47] Merge branch 'devel/master'

Change-Id: If12618ebc55f39fabbf9635e21b2df53181a33f8