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


Trivial merge