Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895
-s ours am: 7475b96786
-s ours am: 2ce24a1fa9
-s ours am: 06c2588645
-s ours am: f20abd9355
-s ours am: c7b0174776
-s ours am: 30d0159217
-s ours" into udc-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
73c7b0db75