commit | 5128db9332469976d5c5aab0c8cb14c92d46d7fe | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Dec 06 17:52:30 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 06 17:52:30 2021 +0000 |
tree | 400c75fa19c949e536c6e45b34e64937afc8a7ba | |
parent | cd8e293135adb06192ca8bdb6736c2d8117ddcb8 [diff] | |
parent | 71ff3eab922168f24c6aeca0f442edc85e3b3776 [diff] |
[automerger skipped] Merge "Show scrimmed bouncer from BiometricUnlockCtrl" into sc-qpr1-dev am: 82997b7ac9 -s ours am: 71ff3eab92 -s ours am skip reason: Merged-In Ib3def01e7ffd04ac950f06cbee7d213927110b5b with SHA-1 7c64f2cd03 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16374638 Change-Id: Id4083540a281fbefce1d199b6b787dbec4eec2b1