[dali_1.2.5] Merge branch 'devel/master' 19/87819/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:03:13 +0000 (14:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:03:13 +0000 (14:03 +0100)
Change-Id: I0e2d3ace33c6cc23cc72a86e20e9e2c523f502a4


Trivial merge