[dali_1.2.25] Merge branch 'devel/master' 17/113017/1
authorUmar <m.umar@partner.samsung.com>
Fri, 3 Feb 2017 15:38:20 +0000 (15:38 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 3 Feb 2017 15:38:20 +0000 (15:38 +0000)
commitebcdac32bad3bc97df9cf8772f1ece894ba59e44
tree4affe6cdcea438d633405bfc62918559e124e792
parent177c4949f8e8419d8cc3ca8aaae008460014616a
parent98e9ef8d5dfb62ab93985dddf8847540ac217d98
[dali_1.2.25] Merge branch 'devel/master'

Change-Id: I0fc684d76e4a635543f6fe71f83a1af0cb0c656d