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

Commit ec455e98 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 

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



Change-Id: If4214ec98ac6d29f8da6e6b75fc79de0a4144417
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4720982 e86cf63d
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