[dali_1.2.45] Merge branch 'devel/master' 12/135612/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 23 Jun 2017 09:44:48 +0000 (10:44 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 23 Jun 2017 09:44:48 +0000 (10:44 +0100)
Change-Id: Id1c741b4e25b5140581be8c5da1ff0b0be96022c


Trivial merge