[dali_1.3.38] Merge branch 'devel/master' 87/187487/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:38 +0000 (15:03 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:38 +0000 (15:03 +0100)
commitcb370b34bcdcb1c029a7aa2188e2a2c9275ebd82
tree52ae0966864ffed7e2b885fa849beaedd3f30d1e
parentad11ccbb29cb3912d3efb33703fff0871114ae18
parent57e0c2288d54f4707076e14e4d49ca175ada7af1
[dali_1.3.38] Merge branch 'devel/master'

Change-Id: Ic731b8b8444abecc992bfbac8b90091b674df7c2