[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours am: bf4f533ea6
-s ours am: d890d1b428
-s ours am: 8b995bbc72
-s ours am: 6ad8bea7c9
-s ours am: 618272911a
-s ours am: 179b563079
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340 Change-Id: Ic40a63a2013d67d961e553d65e8bffe10f8ec00c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: