app_Settings

Go to file

Automerger Merge Worker 3594e60694 Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours" into sc-dev am: 638a96896e -s ours

am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6aa8f783244a8c703f68fc7256f12bde0c4939c3

2021-03-11 11:59:50 +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 "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev am: 1d5d101aa6

2021-03-11 08:07:53 +00:00

src/com/android/settings

Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev am: 1d5d101aa6