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


Trivial merge