Merge changes from topic "am-7fd9b2ff33084bf2a8b3220c94124f2f" into udc-qpr-dev-plus-aosp
* changes: Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am:e0b5a793a1
am:257bc2eda1
-s ours am:94573f96bb
-s ours am:488ca4b012
-s ours am:3a7a9be734
-s ours" into udc-d1-dev-plus-aosp am:2d4ca1db18
-s ours [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am:e0b5a793a1
am:257bc2eda1
-s ours am:94573f96bb
-s ours am:488ca4b012
-s ours am:3a7a9be734
-s ours am:b1ea26ca9a
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
680254fe79