app_Settings

Go to file

Edgar Wang 56eb657908 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours am: 761a605352 -s ours

am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I43c83b3770e67629d3690730ffd82fece99b7e41

2022-01-13 05:40:55 +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

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-01-11 00:46:54 +00:00

src/com/android/settings

Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff