app_Settings

Go to file

Automerger Merge Worker 808da23434 Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours

2022-09-13 18:54:26 +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

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-09-08 21:31:01 +00:00

src/com/android/settings

Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb