[dali_1.3.5] Merge branch 'devel/master' 46/165046/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:20:05 +0000 (14:20 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 22 Dec 2017 14:20:05 +0000 (14:20 +0000)
commit291556e49f2c19e8cc04f2182702dbc1a94bba0a
tree31c440dbc6b39b27ba656a7690f4697f891a4121
parent8e7b79aa32faa45e8a231c7b3e413d7ad1783acf
parent893905a5b2d85d98101dc10751a6631b708376c9
[dali_1.3.5] Merge branch 'devel/master'

Change-Id: I0c7ad83a255f66599b11bbb25768bc5d5b54f47d