[dali_1.3.35] Merge branch 'devel/master' 06/185906/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 3 Aug 2018 09:31:12 +0000 (10:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 3 Aug 2018 09:31:12 +0000 (10:31 +0100)
commit3f68e6293fd8ae60250897c5cbf5aa466cafa631
tree5ae641e07459e847764d2ce5fea6a0b3f62642d6
parentdc8ffec75c7b3dddcfbbadfac5325631f7c8ac91
parent791b0ffbcab3da7ad7ecf5d085cc0f9976698ebd
[dali_1.3.35] Merge branch 'devel/master'

Change-Id: I9f0f532d45000c18bff0d4ab10e6e32ac8b076f5