[dali_1.3.36] Merge branch 'devel/master' 60/186560/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:12:33 +0000 (10:12 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:12:33 +0000 (10:12 +0100)
commit6408097aa20668bac4fe613973aa8fe9bd3f9c6a
treebceaf311127f1f7bad9bc2d003c94523188c0879
parentd398371be432039b20a8777b4bb8bb8c8f91f078
parent3d681e4bc69cc2283488cca884cee24d125703ea
[dali_1.3.36] Merge branch 'devel/master'

Change-Id: Ib76a3d0976f7de5e0e3eb763f997e610d90b3f69