[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 8e234af041 -s ours am: 7989bc077b -s ours am: 10592e4261 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129 Change-Id: Idc2a8f0070d384ca5b95061e222886219c9c3f78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: