[dali_1.3.1] Merge branch 'devel/master' 48/161648/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:57:02 +0000 (11:57 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:57:02 +0000 (11:57 +0000)
commit8c0d7116b8367e50f834eedd5d0b9bc02e74a8eb
treed103dc25895ac5f2335f50d71e0ab5ebdb6e1234
parent9b0dbb24b7bc1263e5ffb302361db768de2b45f6
parentdffcb635eeac0680a6320a7c7e80eb75845a88e0
[dali_1.3.1] Merge branch 'devel/master'

Change-Id: I120eac7ba19538802415d1099d12954999b3d367