[dali_1.2.25] Merge branch 'devel/master' 18/113018/1
authorUmar <m.umar@partner.samsung.com>
Fri, 3 Feb 2017 15:38:27 +0000 (15:38 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 3 Feb 2017 15:38:27 +0000 (15:38 +0000)
commit969855f52a7c30ea6309d41b416100b47161bc66
treebbbe977503bae145374590bd955420a85e647e44
parent3320153709e9409873ee708680b1b9eed8cb1060
parent6630638215878dbd545843c0956c480833cf8be7
[dali_1.2.25] Merge branch 'devel/master'

Change-Id: I86f3f01af8119a79e5fa52be58875822f90780c9