git.osdn.net Git - android-x86/system-bt.git/commit

OSDN Git Service

(root) / android-x86 / system-bt.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 6fc4832) | patch

author	Andre Eisenbach <eisenbach@google.com>
	Thu, 11 Jun 2015 04:04:38 +0000 (21:04 -0700)
committer	Andre Eisenbach <eisenbach@google.com>
	Thu, 11 Jun 2015 04:07:19 +0000 (21:07 -0700)
commit	979e3421c8111a56ebfcf176f6383df58eed52ea
tree	115b636fdcf8c8420f5eed07681d2963680cf4e4	tree \| snapshot
parent	6fc4832730341b0ba944e5de72ffe5171089f8b7	commit \| diff

Fix mnc-dev <-> master merge errors

Change-Id: If4d56229de7d47289560a12205feb7e33ac6fcf5

19 files changed:

bta/dm/bta_dm_act.c		diff \| blob \| history
bta/dm/bta_dm_api.c		diff \| blob \| history
bta/dm/bta_dm_int.h		diff \| blob \| history
bta/dm/bta_dm_main.c		diff \| blob \| history
bta/include/bta_api.h		diff \| blob \| history
btif/co/bta_ag_co.c		diff \| blob \| history
btif/src/btif_dm.c		diff \| blob \| history
btif/src/btif_gatt_client.c		diff \| blob \| history
stack/btm/btm_ble.c		diff \| blob \| history
stack/btm/btm_ble_adv_filter.c		diff \| blob \| history
stack/btm/btm_ble_batchscan.c		diff \| blob \| history
stack/btm/btm_ble_bgconn.c		diff \| blob \| history
stack/btm/btm_ble_gap.c		diff \| blob \| history
stack/btm/btm_ble_int.h		diff \| blob \| history
stack/include/btm_api.h		diff \| blob \| history
stack/include/btm_ble_api.h		diff \| blob \| history
stack/include/gatt_api.h		diff \| blob \| history
stack/include/hcidefs.h		diff \| blob \| history
stack/include/hcimsgs.h		diff \| blob \| history

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.