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