OSDN Git Service

am 2af0bb6e: Fix merge discrepencies and resulting compile errors
authorAndre Eisenbach <eisenbach@google.com>
Mon, 19 Oct 2015 19:03:01 +0000 (12:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 19:03:01 +0000 (12:03 -0700)
commit7fbf06c2ba7a57d38e567c36941d5aca8c906b71
treea0744f29609884ac8835aa880223f669929e73be
parentd3bfaecca37776ba15ac3b2acdc6fea9524172b4
parent2af0bb6e5f6b380f374d510c54eabdf74c32bdf2
am 2af0bb6e: Fix merge discrepencies and resulting compile errors

* commit '2af0bb6e5f6b380f374d510c54eabdf74c32bdf2':
  Fix merge discrepencies and resulting compile errors
btif/src/btif_core.c