[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957
-s ours am: 7bed9704c9
-s ours am: c86183ec60
-s ours am: 3c3282b46b
-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: Icbf79d73b66d357aee242c04be09ee1ce6746e93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: