Tian Hao f87ebb6d49 Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid ... # Conflicts: # components/bt/bluedroid/stack/btu/btu_task.c		2016-10-16 17:08:05 +08:00
..
btu_hcif.c	1. Recover "future_t" model implementation using semaphore to allow for blocking function	2016-10-10 21:34:21 +08:00
btu_init.c	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-10-16 17:08:05 +08:00
btu_task.c	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-10-16 17:08:05 +08:00