| commit | bdbd44ff47d1d5d1475b2d77e4ccbd1857766401 | [log] [tgz] |
|---|---|---|
| author | Kholoud Mohamed <kholoudm@google.com> | Wed Mar 31 13:27:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 13:27:31 2021 +0000 |
| tree | 07ee2e13358b0ef5a861d9666f133d6021447939 | |
| parent | 378238f057b93ed0c533661efc969a130e205d31 [diff] | |
| parent | b2cbf35643e4a71064b80bfd20892351d08ca810 [diff] |
[automerger skipped] Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c5019038 am: fb7b92801f am: b2cbf35643 -s ours 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