Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours am: 80ef1e0ff5
-s ours am: 7f97ac5ea7
-s ours am: 4643015447
-s ours am: f050fc11ca
-s ours am: a78f35b23d
-s ours am: 1679e7f685
-s ours am: 090679fdc8
-s ours" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
0fc78b0ffa