Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
am: 011f39e944
-s ours am: f509f69b79
-s ours am: 4809792e9b
-s ours" into udc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
2f507aced7