[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: 35e6c7b3dd
-s ours am: d220b79a3f
-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: Icf950b0ec4b92690df5c93e6cef95aeb54827122 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: