| commit | 40832590c7a12f08c7f9e8ee2c687a275f13e0c0 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Mon Oct 09 21:49:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 21:49:32 2023 +0000 |
| tree | f2bf4196a1fbb98b25add76de316a169231496e5 | |
| parent | e1defa044ea29f8177c81282a02c15111beb9dab [diff] | |
| parent | 7fcb018b7a9239fb44d17bcc228b091f23888653 [diff] |
Merge changes from topic "locksettings-aosp" into main am: 7df13d67fe am: 7fcb018b7a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775386 Change-Id: I039d0b0f563272e2a5da53fa15f269d45c752425 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>