Merge "Add Delay reporting for Hearing Aids" am: 122ce6871f

author Stanley Tng <stng@google.com>

Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)

committer android-build-merger <android-build-merger@google.com>

Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)
author Stanley Tng <stng@google.com>
Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)
committer android-build-merger <android-build-merger@google.com>
Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)
diff --cc bta/hearing_aid/hearing_aid.cc
Simple merge
diff --cc stack/gatt/gatt_main.cc
Simple merge
author	Stanley Tng <stng@google.com>
	Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)
		1	2
bta/hearing_aid/hearing_aid.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/gatt/gatt_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history