am d488c105: am 145348f4: am aa3be1a6: Implement Bluetooth settings factory reset...

author Ajay Panicker <apanicke@google.com>

Wed, 5 Aug 2015 18:19:23 +0000 (18:19 +0000)

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

Wed, 5 Aug 2015 18:19:23 +0000 (18:19 +0000)
author Ajay Panicker <apanicke@google.com>
Wed, 5 Aug 2015 18:19:23 +0000 (18:19 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 5 Aug 2015 18:19:23 +0000 (18:19 +0000)
diff --cc btif/src/bluetooth.c
Simple merge
diff --cc btif/src/btif_config.c
Simple merge
author	Ajay Panicker <apanicke@google.com>
	Wed, 5 Aug 2015 18:19:23 +0000 (18:19 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 5 Aug 2015 18:19:23 +0000 (18:19 +0000)
		1	2
btif/src/bluetooth.c	patch \|	diff1 \|	diff2 \|	blob \| history
btif/src/btif_config.c	patch \|	diff1 \|	diff2 \|	blob \| history