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