[dali_1.4.0] Merge branch 'devel/master' 97/196097/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 21 Dec 2018 10:23:04 +0000 (10:23 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 21 Dec 2018 10:23:04 +0000 (10:23 +0000)
commita69932b2e014b4f8b9cd9083d3e06340c5d9fc55
tree500ee0f777400f0ca4839a7fcce011e51f127b61
parent7b531836b685ab75b8dc8d697f7e9d858167f9e0
parentf1e46c66db7eb856716d57ebe2b2f0bafb20817a
[dali_1.4.0] Merge branch 'devel/master'

Change-Id: Ia2703e6d0d8e736f18c13e3cdb84c4ff4504a397