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

Commit 3829e330 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: cfde1139

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



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