app_Settings

Go to file

Eric Biggers 67c4be1e52 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours

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

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

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

2023-08-08 01:31:46 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d

2022-06-02 20:33:48 +00:00

src/com/android/settings

RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()