[dali_1.2.4] Merge branch 'devel/master' 55/86755/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:44 +0000 (15:02 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 2 Sep 2016 14:02:44 +0000 (15:02 +0100)
Change-Id: Ief188f22f6674ae4cd9dbf07a2accc33933b8bb7


Trivial merge