Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid

Browse Source

# Conflicts:
#	components/bt/bluedroid/profiles/core/bt_prf_sys_main.c
#	components/bt/bluedroid/profiles/core/bt_prf_task.c
#	components/bt/bluedroid/profiles/core/include/bt_prf_sys.h
#	components/bt/bluedroid/profiles/core/include/bt_prf_task.h
#	components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h
#	components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c
#	components/bt/bluedroid/stack/btm/btm_sec.c

...

This commit is contained in:

Tian Hao

2016-11-04 19:32:47 +08:00

parent 4ea38327b6 b83b0ed06a

commit acda125e8b

57 changed files with 3833 additions and 632 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1236

components/bt/bluedroid/stack_api/bt_app_api.c Normal file

File diff suppressed because it is too large Load Diff