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

Commit 7cbaaaa8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



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