Merge "fix compliation when BLE_VND_INCLUDED is false"

author Adam Hampson <ahampson@google.com>

Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)
author Adam Hampson <ahampson@google.com>
Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)
diff --cc stack/btm/btm_ble_gap.c
Simple merge
diff --cc stack/l2cap/l2c_ble.c
Simple merge
diff --cc vnd/ble/vendor_ble.c
Simple merge
author	Adam Hampson <ahampson@google.com>
	Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)
		1	2
stack/btm/btm_ble_gap.c	patch \|	diff1 \|	diff2 \|	blob \| history
stack/l2cap/l2c_ble.c	patch \|	diff1 \|	diff2 \|	blob \| history
vnd/ble/vendor_ble.c	patch \|	diff1 \|	diff2 \|	blob \| history