app_Settings

Go to file

Andras Kloczl 2c2c565c37 [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7ed616c466 -s ours am: 73f14dcdf2 -s ours

am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a83409801af9cabf27e04d8713fc6eab0adf0d3

2021-03-11 11:59:27 +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