| commit | 26435d8f5685262c64d7ed0170ab69bfee93c680 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 23:04:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 23:04:14 2023 +0000 |
| tree | 480a1c2525d45b54094a03ac4722e7c6a4d0cd11 | |
| parent | 88361d7657e01ac7ddc69507587299cf4c6d18af [diff] | |
| parent | 01567c311eaaa5330f6ed92fbf85c7002aecef3c [diff] |
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours am: 503317bba1 -s ours" into udc-d1-dev-plus-aosp am: 01567c311e -s ours am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339 Change-Id: Id66ed318123977e68eb1d56c85a342bb24d84d52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>