app_Settings

Go to file

Xin Li 98393cab55 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca561 -s ours am: 98c2ff5b3b -s ours

am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

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

Change-Id: I84b03571dd3a54e31c2c0af16c752254b4a5a3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-08-17 00:58:18 +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

resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7

2022-07-29 10:27:37 +00:00

src/com/android/settings

Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a