3ce36868367238be02d223ab6bf557f0388f5e01
e705fcd7c3 am: 2a0a88af4d am: dad4720a31 am: cb4de95600
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780 Change-Id: I1bf71a120f7db3f388a5e279a7e13ece80eef571 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Fix incorrect storage calculation when SD card is inserted" am:
e705fcd7c3 am: 2a0a88af4d am: dad4720a31 am: cb4de95600
[conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am:
ac6af411ed am: 326c0ea30c
…
…
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%