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

Skip to content
Unverified Commit 08bc3435 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge commit 'd89dab95' into staging/lineage-20.0_android-security-13.0.0_r17

* commit 'd89dab95':
  Reapply "AudioService: anonymize Bluetooth MAC addresses"
  Reapply "Refactor the SADeviceState to AdiDeviceState"
  Revert "Refactor the SADeviceState to AdiDeviceState"
  Revert "AudioService: anonymize Bluetooth MAC addresses"
  Prioritize system toasts

Conflicts:
	services/core/java/com/android/server/clipboard/ClipboardService.java

Change-Id: Id50e77ae779316408fed277ceec5266169123939
parents fc78e099 d89dab95
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment