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

Commit 0ae6e0e0 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Add internal constant to resolve merge-conflict" am: f4903895 

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



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