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

Commit c2c2f35a authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Automerger Merge Worker
Browse files

Merge "(2/N)[MediaProjection] Show dialog when token is reused" into udc-dev... 

Merge "(2/N)[MediaProjection] Show dialog when token is reused" into udc-dev am: 1d535bc3 am: b6b3a538 am: 861a96c8

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



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