Merge "[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" into udc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
e53cd73324