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


Trivial merge