commit | f54e5f90805b715c3acba0ddcab2923df042122e | [log] [tgz] |
---|---|---|
author | Aaron Liu <aaronjli@google.com> | Wed Apr 19 23:35:09 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 19 23:35:09 2023 +0000 |
tree | e13a0f82bb67274ff7e49a6b3dfc49ea874b27a0 | |
parent | 0108ff97aab5dec4838d9f58cbdbf6fb9d4bfc24 [diff] | |
parent | 716bc14ee03ad279ca8d6945b7ceb7bd63d8c0a8 [diff] |
[automerger skipped] Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev am: 2b3817680a am: cd993dd7e0 -s ours am: 4d4d843d5a -s ours am: df080e09b4 -s ours am: c3068ba5b6 -s ours am: ead918b2f2 -s ours am: 716bc14ee0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733 Change-Id: Ibf622e5bcbfe456dd79b6e8d8ff65c92258c2cc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>