app_Settings

Go to file

Automerger Merge Worker 71ab33b3b5 Merge changes from topic "am-14fdde8e45c44bc8aa7d94ffcc435b82" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: c484ac981e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: 9ba1e26bdf -s ours

2022-05-23 20:04:23 +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-05-21 09:20:58 -07:00

src/com/android/settings

Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 89f6686597