app_Settings

Go to file

Andras Kloczl b296da83f2 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours am: f9eacae4a0 -s ours am: 9b6dcc321f -s ours

am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 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: I00a50c775888f87f8d58c48f1278db7959291625

2021-03-11 12:00:25 +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