[dali_1.2.16] Merge branch 'devel/master' 44/100144/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 25 Nov 2016 07:08:25 +0000 (07:08 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 25 Nov 2016 07:08:25 +0000 (07:08 +0000)
Change-Id: I66296964838e9c231eced0aa9e41d9b43e328de9


Trivial merge