| commit | eeba25e2f334c03fdf16cd2f30ab71a1074b472d | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 23:51:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 23:51:02 2023 +0000 |
| tree | 58222b17ac545ddfaed15e7219ca107312251596 | |
| parent | 7cb838d35234e2cf17556fb8a1f11cfdb352e21e [diff] | |
| parent | af0ddcf8e62c5c6abfaea95b09b121cd98d73410 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours am: 4471257a0b -s ours am: 6cc1240b9d -s ours am: af0ddcf8e6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399 Change-Id: Ia0200da1d6ac0c0831b21881b8613862407981b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>