[dali_1.2.26] Merge branch 'devel/master' 73/114173/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Feb 2017 07:58:56 +0000 (07:58 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Feb 2017 07:58:56 +0000 (07:58 +0000)
Change-Id: I0acfce9dd4de7fa42b4de312af9ac8437401ab00


Trivial merge