[dali_1.2.32] Merge branch 'devel/master' 77/120877/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:52:16 +0000 (11:52 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:52:16 +0000 (11:52 +0000)
Change-Id: I977ad141cb18f7b9538f3360b99e5c68aa8b910d


Trivial merge