[dali_1.3.54] Merge branch 'devel/master' 06/195606/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 14 Dec 2018 15:38:36 +0000 (15:38 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 14 Dec 2018 15:38:36 +0000 (15:38 +0000)
Change-Id: I2f6abb944d5109740772c706ee1709c7d3b7e414


Trivial merge