resolved conflicts for merge of 27c4e634 to mnc-dev-plus-aosp

Change-Id: Id6d78e484d58042e93e4d4ea34522d15a6e1ba59

diff --cc btif/src/btif_dm.c
index eb05d64,4a02d11..b0cecc2
--- 1/btif/src/btif_dm.c
--- 2/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@@ -37,59 -37,25 +37,36 @@@
  
  #include <hardware/bluetooth.h>
  
 +/**
 + * TODO(armansito): cutils/properties.h is only being used to pull-in runtime
 + * settings on Android. Remove this conditional include once we have a generic
 + * way to obtain system properties.
 + */
 +#if !defined(OS_GENERIC)
  #include <cutils/properties.h>
 -#include "gki.h"
 -#include "btu.h"
 -#include "btcore/include/bdaddr.h"
 +#endif  /* !defined(OS_GENERIC) */
 +
 +#include "bdaddr.h"
  #include "bta_api.h"
 +#include "bta_gatt_api.h"
  #include "btif_api.h"
 -#include "btif_util.h"
 +#include "btif_config.h"
  #include "btif_dm.h"
 -#include "btif_storage.h"
  #include "btif_hh.h"
 -#include "btif_config.h"
  #include "btif_sdp.h"
 +#include "btif_storage.h"
 +#include "btif_util.h"
 +#include "btu.h"
 +#include "gki.h"
+ #include "bta_gatt_api.h"
+ #include "device/include/interop.h"
+ #include "include/stack_config.h"
+ #include "osi/include/log.h"
  #include "osi/include/allocator.h"
 +#include "osi/include/log.h"
 +#include "stack_config.h"
  
  /******************************************************************************
- **  Device specific workarounds
- ******************************************************************************/
- 
- /**
-  * The devices below have proven problematic during the pairing process, often
-  * requiring multiple retries to complete pairing. To avoid degrading the user
-  * experience for other devices, explicitely blacklist troubled devices here.
-  */
- static const UINT8 blacklist_pairing_retries[][3] = {
-     {0x9C, 0xDF, 0x03} // BMW car kits (Harman/Becker)
- };
- 
- BOOLEAN blacklistPairingRetries(BD_ADDR bd_addr)
- {
-     const unsigned blacklist_size = sizeof(blacklist_pairing_retries)
-         / sizeof(blacklist_pairing_retries[0]);
-     for (unsigned i = 0; i != blacklist_size; ++i)
-     {
-         if (blacklist_pairing_retries[i][0] == bd_addr[0] &&
-             blacklist_pairing_retries[i][1] == bd_addr[1] &&
-             blacklist_pairing_retries[i][2] == bd_addr[2])
-             return TRUE;
-     }
-     return FALSE;
- }
- 
- /******************************************************************************
  **  Constants & Macros
  ******************************************************************************/
  

diff --cc device/src/interop.c
Simple merge