[dali_1.2.45] Merge branch 'devel/master' 13/135613/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 23 Jun 2017 09:45:06 +0000 (10:45 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 23 Jun 2017 09:45:06 +0000 (10:45 +0100)
Change-Id: I6e00f9c848b395a5428fb021c60b46dc1439ff07


Trivial merge