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

Commit ab038290 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Fix a potential ODR vialation" into main am: 91da388b am: 5f5e57d3 am: 64979a26 

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



Change-Id: I83126927333a74a90feddf2d662320f1acdbb94d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65ee632f 64979a26
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