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

Commit 370d7864 authored by Nino Jagar's avatar Nino Jagar Committed by Automerger Merge Worker
Browse files

Merge "Add flags and options for content protection" into udc-qpr-dev am: 6b5e167b am: f8b80eb8 

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



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