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


Trivial merge