app_Settings

Go to file

TreeHugger Robot 3319bbdd3d [automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc848 -s ours

am skip reason: Merged-In I1cc3796f31e7db3d8f062436ebc618d93db19822 with SHA-1 38d3b0fa18 is already in history

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

Change-Id: Ida0de335047c2cebe9f86810c9fdd529738fdc41

2021-06-18 00:51:54 +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 "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533

2021-06-17 22:27:19 +00:00

src/com/android/settings

Merge "Use ICU style for choose_sim_text to handle special cases in RU" into sc-dev am: 2c5788b533