[dali_1.3.35] Merge branch 'devel/master' 05/185905/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 3 Aug 2018 09:31:05 +0000 (10:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 3 Aug 2018 09:31:05 +0000 (10:31 +0100)
commitca8cb471bd6374e6220a3c4f3b7c6c4257766a7f
treec9c359cd842f74c27c4b1aa04f0d15d8abce78ee
parent66bd9c73bca286dc5cd1fd051b8fbdcd57639c09
parenteaf968a1ef6bc12375566a2330d61660f265574c
[dali_1.3.35] Merge branch 'devel/master'

Change-Id: Ie7f1216638cdb470598b2e9ec94dcaee3d02faae