Skip to content
Commit bdbd44ff authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Create new permission... 

[automerger skipped] Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c50190 am: fb7b9280 am: b2cbf356 -s ours

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

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

Change-Id: Iddf2890b128f8f801d83dc917f0656cf7780fde8
parents 378238f0 b2cbf356
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