[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)
commiteb807cea85ad0fc8ebcbabb8ecfc3e4fe0388476
treee6563776bee658e2d495b507118f7be3bc3cb90e
parent31e0021038459c27509024a104579dd26b40a18d
parent90d1d277979a210c67c926bee8ad3bd80085a5fe
[dali_1.2.4] Merge branch 'devel/master'

Change-Id: Ief188f22f6674ae4cd9dbf07a2accc33933b8bb7