[dali_1.3.12] Merge branch 'devel/master' 78/170278/1
authorDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:33 +0000 (13:56 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:33 +0000 (13:56 +0000)
commit51942c1b347d82ecadec2b9e5c66d228e302c28a
tree58cf4beaa0d36b99cfb2a30c8d1071be1bd7a961
parent4b609f67cdae92f43d17954cff2b105634538bdc
parenta7fbe365fc7a77f7e9d9ea2b6346750d481584d2
[dali_1.3.12] Merge branch 'devel/master'

Change-Id: I1d0404b46033d498c351654e7d1b9071ecebc6cd