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

Commit 75d892fb authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-2ba8d55c2d6743bb8d2acd19d4b8b7b5" into udc-qpr-dev-plus-aosp 

* changes:
  [automerger skipped] Merge "[conflict resolved] Merge "Add validation on sdp attributes in bta_av_act.cc" into tm-dev am: be6cf234 am: 1f136b06 am: 9b8c9970 am: 02a69d4c" into udc-d1-dev-plus-aosp am: 1d20f397 -s ours
  [automerger skipped] [conflict resolved] Merge "Add validation on sdp attributes in bta_av_act.cc" into tm-dev am: be6cf234 am: 1f136b06 am: 9b8c9970 am: 02a69d4c am: 6cdf9d55 -s ours
parents ec27ca9b d2b79bbd

There are no changes