[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours am: c86183ec60 -s ours am: c7052d15af -s ours am: d58a47c4d0 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336

Change-Id: I5f57fce5f6b6b947421c89479a15890a9fb928fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-08-08 03:56:57 +00:00
committed by Automerger Merge Worker

Diff Content Not Available