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

Commit 737ab13a 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 am: f8037913 

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



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