[dali_1.3.0] Merge branch 'devel/master' 13/160713/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:46:47 +0000 (14:46 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:46:47 +0000 (14:46 +0000)
commit310e8c16cccb24e2360c86e41c6ba097705b700b
tree067b09d2ea9996bdd6360a71e95ed4b26afbf3c6
parent5982fcf12fc0f3a21063f02ee432118faa5ca86a
parent56f0e94bab1f9ecc097c4a5209716cdc1ede7715
[dali_1.3.0] Merge branch 'devel/master'

Change-Id: Iad74ce47e665be00c02744b6de458b2ede8cef8c