[dali_1.2.16] Merge branch 'devel/master' 42/100142/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 25 Nov 2016 07:07:50 +0000 (07:07 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 25 Nov 2016 07:07:50 +0000 (07:07 +0000)
Change-Id: I3ffab4e4102d7df54d4559f1e5b99f752cee7b60


Trivial merge