[automerger] Don't use Address after it was deleted am: 228712652a am: 4530549386...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 13 Jul 2018 06:58:21 +0000 (06:58 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 13 Jul 2018 06:58:21 +0000 (06:58 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 13 Jul 2018 06:58:21 +0000 (06:58 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 13 Jul 2018 06:58:21 +0000 (06:58 +0000)
diff --cc bta/dm/bta_dm_act.c
Simple merge
diff --cc stack/btm/btm_dev.c
Simple merge
diff --cc stack/include/btm_api.h
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 13 Jul 2018 06:58:21 +0000 (06:58 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 13 Jul 2018 06:58:21 +0000 (06:58 +0000)
		1	2
bta/dm/bta_dm_act.c	patch \|	diff1 \|	diff2 \|	blob \| history
stack/btm/btm_dev.c	patch \|	diff1 \|	diff2 \|	blob \| history
stack/include/btm_api.h	patch \|	diff1 \|	diff2 \|	blob \| history