[dali_1.9.36] Merge branch 'devel/master' 38/246538/1
authorDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:26 +0000 (14:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:26 +0000 (14:34 +0000)
commit5413476153d9bde036fcbcc7e18b4f34a30c0d21
tree8098c6157ab0b3d6ed3b8dba387a5a8ec4c28ccd
parentac45b51f1ca2ca871473f4cd42868c8e6f087773
parente1e05812ca3f2abdfe9c30794a29c57c377d1a21
[dali_1.9.36] Merge branch 'devel/master'

Change-Id: Id36213bc6157aa75dcf24ebb9c4e6b07f874eca9