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


Trivial merge