a40d45dec07b48634575bdc705d5e88f03b9ed58
1742524dd3
am: 728b1b8337
am: 134b71f95f
-s ours
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I500743115266907cd963c0ad4aaa31132d6613a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Show disable dialog box when none is selected" into udc-dev am:
1742524dd3
am: 728b1b8337
am: 00cc06ab7a
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am:
5576947555
am: 4d3264553c
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%