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

Commit 60eac5c3 authored by Hui Peng's avatar Hui Peng
Browse files

[conflict resolved] Merge "Add validation on sdp attributes in bta_av_act.cc"...

[conflict resolved] Merge "Add validation on sdp attributes in bta_av_act.cc" into tm-dev am: be6cf234 am: 1f136b06 am: 9b8c9970

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



Merged-In: I5286fabf49f14cba5ef65a79d6e1eadb40bbb514
Merged-In: I3231e4fdb39f30085425113358898fab7ec8e68c
Change-Id: I14d0aa83ea9868be7dc5660e014a331ddf9efd31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7769323 9b8c9970
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment