| commit | 71814b355c6ab63d6e96d1b5af6b2edd14d4867c | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Fri Aug 11 00:38:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 11 00:38:25 2023 +0000 |
| tree | f5555d9ec60d2993bd0cddd529d0daac5a5c4e25 | |
| parent | a386c786780f01bc41514a483dbd2ffca3c53518 [diff] | |
| parent | 137235a27ff12d562e3f73e29f837b7f7febdb51 [diff] |
Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640 Change-Id: I3e589ba397243133a203ab3147bffea11f7158bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>