app_Settings

Go to file

Automerger Merge Worker 6a3651d10d [automerger skipped] Merge changes from topic "am-ea89e571cc6e473fbf0101de439fe785" into sc-v2-dev-plus-aosp am: 89a780e0de -s ours

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

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

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

Change-Id: I5f25c2c1f4396604128f2877ddf2fcf5082ea663

2021-10-08 08:07:07 +00:00

libs

Update window aar

2021-10-01 10:15:03 -07:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Update the title of Gesture Navigation page title"

2021-10-08 01:58:07 +00:00

src/com/android/settings

Merge "Update to new method of getting display power profile constants" into sc-v2-dev am: d754409050 am: d8d7b901b0