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

Skip to content
Commit 525b9728 authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am:... 

Merge "[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am: e1391b7d am: 2f92d85e" into udc-dev am: 7f7048c5 am: e20c3840

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22143993



Change-Id: I1c554c451d7b951ac88b5b9756ae67950dac3c20
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d551d0b2 e20c3840
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment