OSDN Git Service

Fix merge discrepencies and resulting compile errors
authorAndre Eisenbach <eisenbach@google.com>
Fri, 22 May 2015 00:07:21 +0000 (17:07 -0700)
committerScott James Remnant <keybuk@google.com>
Mon, 19 Oct 2015 17:35:00 +0000 (10:35 -0700)
commit2af0bb6e5f6b380f374d510c54eabdf74c32bdf2
tree76c364d10ba5e0740e833684973e71772a914070
parentff1469f0e762840c0c745e7306b1edd96167a4c6
Fix merge discrepencies and resulting compile errors

Change-Id: I29fbec9f668ee9218b90a222801c9ddcb9352017
btif/src/btif_core.c