[dali_1.2.61] Merge branch 'devel/master' 69/155569/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:35 +0000 (15:00 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:35 +0000 (15:00 +0100)
commit1b78a757a60b1eb2d74204b96646bdda62cc8c1f
tree8260f66fd31e7873c1dd1dbc5e6e8382240d112e
parent410125f32fcd135226a2a0a668b2855ea9e17a69
parent90ab000e782c2321836c2a6dfb26c0444ce1553e
[dali_1.2.61] Merge branch 'devel/master'

Change-Id: I02d7ace3aa966803ff368b584fc59f23314c23e9