[dali_1.3.25] Merge branch 'devel/master' 38/179538/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 18 May 2018 11:04:39 +0000 (12:04 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 18 May 2018 11:04:39 +0000 (12:04 +0100)
commit07fe2670adef3f15758b26d08d763289e632506b
tree0d4601d9af934d448b4373fd6c621e53b943e758
parent18e7c9a90a33a23528cb2de5bb4f6060ee86bca2
parent6b613fa8ec8bb38d20b8ecb97b5ea41fcd7fd41e
[dali_1.3.25] Merge branch 'devel/master'

Change-Id: I53f91b370689c8944e6ca521822f66cfd4f32b31