OSDN Git Service

resolved conflicts for merge of 49a86709 to mnc-dev-plus-aosp
authorMarie Janssen <jamuraa@google.com>
Fri, 7 Aug 2015 20:15:26 +0000 (13:15 -0700)
committerMarie Janssen <jamuraa@google.com>
Fri, 7 Aug 2015 20:15:26 +0000 (13:15 -0700)
commit08393054f0867d0f86a7f9c2eb156e67a86382c7
treeed15b8e89181526207cda5c284fe502899a5401b
parentf1f3158daa4534fc0fa42a67c0779b07e739fe7e
parent49a86709488e5cfd5e23759da18bf9613e15b04d
resolved conflicts for merge of 49a86709 to mnc-dev-plus-aosp

Change-Id: Icd7ec2fd78ac4383da430708a88abaeba9009437
26 files changed:
bta/gatt/bta_gattc_act.c
bta/gatt/bta_gattc_utils.c
btif/include/btif_gatt_util.h
btif/src/bluetooth.c
btif/src/btif_av.c
btif/src/btif_config.c
btif/src/btif_dm.c
btif/src/btif_gatt_client.c
btif/src/btif_gatt_server.c
btif/src/btif_gatt_util.c
btif/src/btif_hf.c
btif/src/btif_hh.c
btif/src/btif_rc.c
btif/src/btif_sdp_server.c
btif/src/btif_sock_l2cap.c
btif/src/btif_sock_sdp.c
btif/src/btif_storage.c
device/src/controller.c
hci/src/hci_inject.c
hci/src/hci_layer.c
osi/src/alarm.c
osi/src/config.c
stack/btm/btm_ble.c
stack/btm/btm_ble_gap.c
stack/btm/btm_sec.c
stack/l2cap/l2c_api.c