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


Trivial merge