Merge changes from topic "am-cd5a3cea6b294c4983a26f694f5a5c34" into udc-qpr-dev-plus-aosp
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am:dee47fbf68
-s ours am:5a04afe7dd
-s ours am:b87c5aa1a9
-s ours [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am:8f3ca8daeb
-s ours am:e10ad67f99
-s ours am:87bbc90fbc
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
93e778592b