[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)
Change-Id: I0fc684d76e4a635543f6fe71f83a1af0cb0c656d


Trivial merge