Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am: 9ef98020f1 am: 9b3ad0ca1d

author Chris Manton <cmanton@google.com>

Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)

committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)
author Chris Manton <cmanton@google.com>
Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)
diff --cc bta/dm/bta_dm_act.cc
Simple merge
diff --cc bta/include/bta_api.h
Simple merge
author	Chris Manton <cmanton@google.com>
	Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)
		1	2
bta/dm/bta_dm_act.cc	patch \|	diff1 \|	diff2 \|	blob \| history
bta/include/bta_api.h	patch \|	diff1 \|	diff2 \|	blob \| history