[dali_1.2.14] Merge branch 'devel/master' 64/97264/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:41:05 +0000 (18:41 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:41:05 +0000 (18:41 +0000)
commitfc829906bc88730e08c8d483a351bd1a1ffc563f
treee1fef4ee1edff37343136cedb65afe628e3200f6
parent140fc4e567fa70d1fac89b50cf67b530a4dae0af
parentad17c59461d1ab08f0065f6b31af0864144d642d
[dali_1.2.14] Merge branch 'devel/master'

Change-Id: I3bbf18b3f11e44ed5ab56742ac954d3e222e68a9