[dali_1.2.6] Merge branch 'devel/master' 39/88339/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:45 +0000 (10:56 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:45 +0000 (10:56 +0100)
commitad1e433e14bd869f95c8a3d0709264cd55c416b8
treedef68515f35915ba601646700a726d08c5494bb6
parente74b8b44afcf8bb20a7fe3da25ececb0e01e7469
parenta1027beac93b3c80bda2b41b6432c4087983c3e9
[dali_1.2.6] Merge branch 'devel/master'

Change-Id: I2048a8be63b0845eb5de5d60434f6d7ec152f548