[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 03fce45518 -s ours am: e0bb7a6d16 -s ours am: 9a81f424ae -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338 Change-Id: I58c4c9cae366e2d683d236a02382db668a9729ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: