Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
am: 257bc2eda1
-s ours am: 94573f96bb
-s ours am: 488ca4b012
-s ours am: 3a7a9be734
-s ours" into udc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
2d4ca1db18