Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours am: f509f69b79 -s ours am: 4809792e9b -s ours" into udc-d1-dev-plus-aosp am: 2f507aced7 -s ours

Browse Source

am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 e0b5a793a1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337

Change-Id: Iad0d74c35499daa0fb9a5388f9b3cc6fa75d672d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Automerger Merge Worker

2023-08-08 04:14:03 +00:00

parent 456e43142b 2f507aced7

commit cb7ed20ec9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available