[dali_1.3.47] Merge branch 'devel/master' 92/191992/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:24:38 +0000 (12:24 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:24:38 +0000 (12:24 +0100)
Change-Id: I6a6b6012b00e5e4c55893ed07eaa7c4f69b4fe99


Trivial merge