| commit | fcb75f018f5d354426502f46f308e2a82d033d6e | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Wed Dec 13 19:33:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 19:33:02 2023 +0000 |
| tree | 613052bbe35059f0c621c2082a3e45663fc47adc | |
| parent | 194faf5eafcc7190bfed66feb16183ea27ad270f [diff] | |
| parent | 8320858a075e4405a010f60a5cde23df5740170f [diff] |
Merge "Fix bad merge resolution in LockSettingsService.java" into main am: 29a229510d am: cdf313d7d6 am: 8320858a07 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2871537 Change-Id: I081e5e05853a59c86f53339f426ad23d7b7fc944 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>