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


Trivial merge