[dali_1.2.65] Merge branch 'devel/master' 25/159625/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Nov 2017 07:21:37 +0000 (07:21 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Nov 2017 07:21:37 +0000 (07:21 +0000)
Change-Id: Ieb3fed1d33b2fa9a096ab75d924c262d6a6d0a2c


Trivial merge