Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours am: bf4f533ea6
-s ours am: d890d1b428
-s ours am: 8b995bbc72
-s ours am: 936bf45faa
-s ours am: 965d046088
-s ours am: d60572e3ed
-s ours" into udc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
1eb56a1e47