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


Trivial merge