app_Settings

Go to file

Bonian Chen 432d8d1cbc [automerger skipped] Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3 am: 40a93c2511 am: 353b231679 -s ours

am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 7656542419 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I332860eba6280bd9b8c565503bbfe6ceb73d33cb

2021-06-28 05:59:44 +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 "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 6fbeadac34

2021-06-28 04:47:38 +00:00

src/com/android/settings

Merge "[Settings] fix for Wifi calling settings page crash"