Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19b0dd98 authored Dec 08, 2020 by Jeff Sharkey

resolve merge conflicts of 6189104d to master

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

parents 59f15d26 6189104d

framework/java/android/bluetooth/OWNERS

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		# Bug component: 27441

		zachoverflow@google.com
		siyuanh@google.com

framework/java/android/bluetooth/le/OWNERS

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		# Bug component: 27441

		zachoverflow@google.com
		siyuanh@google.com

framework/tests/OWNERS

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		include /core/java/android/bluetooth/OWNERS