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

Skip to content
Commit cf00b5bf authored by Ian Baker's avatar Ian Baker Committed by Automerger Merge Worker
Browse files

Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes"... 

Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes" am: 258d8f63 am: 8640d2a4 am: ca790652

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260581



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