Skip to content
Commit a9ff4170 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RESTRICT AUTOMERGE Remove ScrimController from... 

Merge "RESTRICT AUTOMERGE Remove ScrimController from BiometricUnlockController" into tm-qpr-dev am: d411dd57

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



Change-Id: Iec2c5756f9e050bf49791dd1ac25671bfc7d3155
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35915a45 d411dd57
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment