tree 4a083cc6479e150a7f83e880840bd36fdaf96eb8
parent 4283b7c1dc7a656290797d82949eb620500fab6c
parent 3d17582b0bd43b8909b1c27a261d7ca2f609f0cf
author Alice Kuo <aliceypkuo@google.com> 1638155960 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638155960 +0000

[automerger skipped] Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e am: 1da3264140 am: 3d17582b0b -s ours

am skip reason: Merged-In I03dfdc25b57e614194fb8de2c9265edd50760d30 with SHA-1 a6d549fee3 is already in history

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

Change-Id: I525a8b4366da12423d27b38a1be851d2a6e5ac41