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


Trivial merge