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

Commit 575022e5 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Make the Factory Reset Protection unit tests work on TV" into udc-dev... 

Merge "Make the Factory Reset Protection unit tests work on TV" into udc-dev am: f8037913 am: 737ab13a

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



Change-Id: If12cf312b10952dacd600065131c2e0ce2f33059
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4cdf1396 737ab13a
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