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


Trivial merge