[dali_1.2.42] Merge branch 'devel/master' 62/132362/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:27 +0000 (12:56 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:27 +0000 (12:56 +0100)
commit007c58ff4b0705ba6bc61115e53b6a396ab22aa3
tree37d15047ece189cc20850e640e57c21621fdb898
parent929a307639e847b44d0c3d23f90798ab7ecc96ee
parent13702e675a259c90e4fd44046524dc88efbda2da
[dali_1.2.42] Merge branch 'devel/master'

Change-Id: Ibec3ad9a5bb9cfe60d7ca9bf4cbd0f3888b0d918