[dali_1.2.32] Merge branch 'devel/master' 74/120874/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:51:29 +0000 (11:51 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:51:29 +0000 (11:51 +0000)
Change-Id: I48b7a61562e16a251cda8e00ee73258c880396a2


Trivial merge