[dali_1.1.29] Merge branch 'devel/master' 26/65326/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:14 +0000 (11:25 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:14 +0000 (11:25 +0100)
Change-Id: I10e304291306a3ff634c2423a686d53ffbb92c8f


Trivial merge