| commit | 12b794f5913115362ddb8419b4323cfe5f4e356d | [log] [tgz] |
|---|---|---|
| author | Aaron Liu <aaronjli@google.com> | Thu Apr 20 18:48:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 18:48:38 2023 +0000 |
| tree | 252b90e48cf37bdca92ec815af350645dad5373a | |
| parent | 2e76768abb6f1a0f2d216a655850e21d41a87e56 [diff] | |
| parent | 6728f3200969ae638c9f4efa4d94065227fc1a97 [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: c1d6cebdd2 -s ours am: 19b0a5e5af -s ours am: 6728f32009 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733 Change-Id: I1eba9427552a97632fb482b424174fa8d3ada9d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>