Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895
-s ours am: 7475b96786
-s ours am: 2ce24a1fa9
-s ours am: 355e257668
-s ours am: 419537da17
-s ours am: df35caa539
-s ours am: 97da688143
-s ours" into udc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
93a87de2e2