app_Settings

Go to file

Andras Kloczl 8d009addd3 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c am: 7f3b720d75 -s ours am: d065d46ab9 -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/+/13815797

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I931c66e09c4343b3699d40d8554d93a78018de05

2021-03-11 11:57:29 +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:08:00 +00:00

src/com/android/settings

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