am 81173491: Merge "Bluetooth: Cleaning up pan_conn DB, if connection is not successf...

author Sharvil Nanavati <sharvil@google.com>

Thu, 17 Jul 2014 06:37:09 +0000 (06:37 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 17 Jul 2014 06:37:09 +0000 (06:37 +0000)
author Sharvil Nanavati <sharvil@google.com>
Thu, 17 Jul 2014 06:37:09 +0000 (06:37 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 06:37:09 +0000 (06:37 +0000)
diff --cc bta/pan/bta_pan_act.c
Simple merge
diff --cc btif/src/btif_pan.c
Simple merge
author	Sharvil Nanavati <sharvil@google.com>
	Thu, 17 Jul 2014 06:37:09 +0000 (06:37 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 17 Jul 2014 06:37:09 +0000 (06:37 +0000)
		1	2
bta/pan/bta_pan_act.c	patch \|	diff1 \|	diff2 \|	blob \| history
btif/src/btif_pan.c	patch \|	diff1 \|	diff2 \|	blob \| history