app_Settings

Go to file

Automerger Merge Worker 3d7561c4ab Merge changes from topic "am-1da92e41bda443aeaea2b6534a421baf" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: a1a8b5e856 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: a7456fac34 -s ours

2022-06-15 06:31:01 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2022-06-13 17:00:54 -07:00

src/com/android/settings

Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 7e0b5c8c07