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


Trivial merge