[conflict] Merge "Add new strings that are shown when the user is asked to enter pin/pattern/password instead of biometrics" into udc-dev am: b96e63953f am: 04900eb0fd

Browse Source

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

Change-Id: Iac9265dc3592728993805685280074c47de9ae26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Chandru S

2023-06-16 15:04:42 +00:00

parent 52df218366 04900eb0fd

commit c6f69560e3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available