[dali_1.2.58] Merge branch 'devel/master' 82/151982/1
authorDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:07 +0000 (15:24 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:07 +0000 (15:24 +0100)
commit309ed775e3914105c4f50cafe5021385d7311535
tree1e278f9676a814c3dc4ae893e4c72a5f888fc451
parent81bb4cb83cede27341dc55ffdd85ee6ce50b5340
parentfdbbd23c408fd884cb4d18336843cd2a34b11c3d
[dali_1.2.58] Merge branch 'devel/master'

Change-Id: I09d99725c63c36a4f8d770af8b1ade380eadd4a9