[dali_1.2.49] Merge branch 'devel/master' 53/140053/1
authorDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:24:57 +0000 (14:24 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:24:57 +0000 (14:24 +0100)
commitf9547829266790f2cdeea51dea9cf9454e7bde1d
tree87cf6f2d7f6c093537b698d84db725402f4d628d
parent440d9de6b256b91373d82994e22ec5e9ec756438
parent080e6bbcb72c7d8fde762b7024e71dbe34f65367
[dali_1.2.49] Merge branch 'devel/master'

Change-Id: I55721d9973e8ca0ff945c81696b0259f90b4a2d6