[dali_1.1.14] Merge branch 'devel/master' 36/54136/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:17 +0000 (14:42 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:17 +0000 (14:42 +0000)
commitf35da063dcb54f8b7ccd16a0cf934987eff46fba
tree0dedd59c2088c3fb5d9897870939965d9edb438c
parentd787e1fef44eea011afc61fe84eddad48957422e
parent245a9a579e58c4c8ef88cf0fe19ccb2ac6e45e7a
[dali_1.1.14] Merge branch 'devel/master'

Change-Id: Ibe79ddedb221ed2ff264f41fe3bc1c87d40730f3