| 修订版 | f5493c8de933318f6a99d8a46396741edcfef64f (tree) |
|---|---|
| 时间 | 2019-10-16 23:30:17 |
| 作者 | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-7.1.2_r39' into nougat-x86
Android 7.1.2 Release 39 (5787804)
Conflicts:
bta/pan/bta_pan_act.c
stack/bnep/bnep_utils.c
bta/ag/bta_ag_act.c bta/ag/bta_ag_at.c
bta/ag/bta_ag_at.h bta/ag/bta_ag_cmd.c bta/ag/bta_ag_int.h bta/av/bta_av_act.c bta/dm/bta_dm_act.c bta/hh/bta_hh_act.c bta/hl/bta_hl_main.c bta/pan/bta_pan_act.c btif/src/btif_hf.c btif/src/btif_hl.c btif/src/btif_rc.c btif/src/btif_storage.c device/src/controller.c osi/src/alarm.c osi/src/config.c stack/avdt/avdt_msg.c stack/avdt/avdt_scb_act.c stack/avrc/avrc_api.c stack/avrc/avrc_pars_ct.c stack/avrc/avrc_pars_tg.c stack/bnep/bnep_api.c stack/bnep/bnep_main.c stack/bnep/bnep_utils.c stack/btm/btm_ble.c stack/btm/btm_dev.c stack/btm/btm_sec.c stack/btu/btu_hcif.c stack/btu/btu_init.c stack/gatt/gatt_cl.c stack/gatt/gatt_sr.c stack/hcic/hcicmds.c stack/hid/hidh_conn.c stack/include/bt_types.h stack/include/btm_api.h stack/include/btm_ble_api.h stack/include/hcimsgs.h stack/include/rfcdefs.h stack/l2cap/l2c_ble.c stack/l2cap/l2c_fcr.c stack/l2cap/l2c_main.c stack/l2cap/l2c_utils.c stack/mcap/mca_cact.c stack/pan/pan_main.c stack/rfcomm/rfc_ts_frames.c stack/sdp/sdp_db.c stack/sdp/sdp_discovery.c stack/sdp/sdp_main.c stack/sdp/sdp_server.c stack/sdp/sdp_utils.c stack/sdp/sdpint.h stack/smp/p_256_ecc_pp.c stack/smp/p_256_ecc_pp.h stack/smp/smp_act.c stack/smp/smp_l2c.c stack/smp/smp_main.c stack/smp/smp_utils.c
Android-x86
Fork