app_Settings

Go to file

Himanshu Rawat 6076d3acc2 [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours

am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

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

2022-08-02 02:01:16 +00:00

libs

Use androidx.window from prebuilt.

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

protos

…

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

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

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