app_Settings

Go to file

Himanshu Rawat 6d05b035d1 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -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/+/19423651

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

2022-08-09 07:04:21 +00:00

libs

…

protos

…

res

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

2022-07-29 10:11:11 +00:00

src/com/android/settings

Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02

2022-08-02 03:45:28 +00:00

tests