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

Commit 987ef9ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "remove redundent conflict checking" into main am: c6eabcd4 am: 7cbaaaa8 

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



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