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


Trivial merge