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

Commit baaccac8 authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect merge resolution for aosp/2380852" am: e86cf63d am: ec455e98 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2405037



Change-Id: I1f45a2a2b3e20aba2b6f86f15d5ccb62cc0c6abc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 139a068c ec455e98
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment