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