[dali_1.1.28] Merge branch 'devel/master' 52/64452/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 1 Apr 2016 08:33:32 +0000 (09:33 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 1 Apr 2016 08:36:31 +0000 (09:36 +0100)
Change-Id: Id95307103404f189c4d02be0b22397d41d730d0b


Trivial merge