[automerger skipped] Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c5019038 am: fb7b92801f am: b2cbf35643 -s ours

Browse Source

am skip reason: skip tag Change-Id I3cf624f063ba582bc8d3b6aeeb11a46a2ab37636 with SHA-1 ca6813867a is already in history

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

Change-Id: Iddf2890b128f8f801d83dc917f0656cf7780fde8

...

This commit is contained in:

Kholoud Mohamed

2021-03-31 13:27:31 +00:00

committed by Automerger Merge Worker

parent 378238f057 b2cbf35643

commit bdbd44ff47

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