[dali_1.3.11] Merge branch 'devel/master' 26/169826/1
authoradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:52 +0000 (11:09 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:52 +0000 (11:09 +0000)
commit77de769517b677fe26dc5a88cbdbf7fc76b8c599
tree00791cbf175a20ea9e2ec88249fc9373ff7bd489
parent72aa4d106596af9d425707721b7f2481b30bf145
parentc1e43e8f08264cab1f3ddd83ef0af2e6aed3d274
[dali_1.3.11] Merge branch 'devel/master'

Change-Id: Iacf3a77ff4a0e366a6270ceb352284508c910c9d