[dali_1.1.14] Merge branch 'devel/master' 37/54137/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:22 +0000 (14:42 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:22 +0000 (14:42 +0000)
commit716c50498d036a66f25f96f79c5baed4ca759a2b
treecb2bb07805ba8020f826827418b3b1eb3277f9d6
parent0dea44b56b4aac8cad609fdca6e7fbec9fb5aa03
parent25d27483cf9ca5a6503fa066700dc5d831d88e55
[dali_1.1.14] Merge branch 'devel/master'

Change-Id: I807fff98f63889278c380e8d8f65a566b1408a12