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