app_Settings

Go to file

Xin Li 3332b73738 [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: bf45599d43 -s ours am: 69e79704e3 -s ours

am skip reason: Merged-In I9ac05f5da437030e1b5db082ddaf7959f82acccd with SHA-1 d3f9214763 is already in history

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

Change-Id: I7d4b9af134809d835f1e82cb7c3e26dd1e59eb6c

2021-11-18 22:25:14 +00:00

libs

Sticky placeholder and adjacent finish rule in Settings

2021-11-09 22:32:58 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d

2021-11-18 19:48:11 +00:00

src/com/android/settings

Merge "Unhibernate an app when a user exempts it" into sc-v2-dev am: 83a8b76ec2