[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours am: 2f8d8d1d79 -s ours am: 331f4118f2 -s ours am: c18560914f -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: I35bc56a278c45c14445c444ccb7e96058bc04ced Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: