app_Settings

Go to file

András Klöczl e690821501 [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -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/+/13816456

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2052e3022c61172aac54fb1855d500eb3f0755a

2021-03-11 10:42:15 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

RESTRICT AUTOMERGE Update String am: 19aeca103d

2021-01-07 08:05:52 +00:00

src/com/android/settings

Prevent using invalid result uri during multi user image change