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


Trivial merge