fix conflicts rebasing t-e-c on 0.84 version
authorCorentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>
Tue, 12 Aug 2014 12:06:44 +0000 (14:06 +0200)
committerCorentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>
Thu, 14 Aug 2014 15:50:55 +0000 (17:50 +0200)
commit8c0f178b0de22f6084babd6da8fcb04606abc7f4
tree613bcd038fdfd6c9678fc3d513854a279a694477
parent2b221f92fddd229198bf30027f56f00b0b030d02
fix conflicts rebasing t-e-c on 0.84 version

Change-Id: I8edd8b26b86a4189add33deeadc5fc2f96bb34c0
Signed-off-by: Corentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>
bluetooth/bluetooth_instance_capi.cc