app_Settings

Go to file

Taran Singh 56c4d2a5a5 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours

am skip reason: subject contains skip directive

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

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

2023-07-06 21:49:56 +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

Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev