47fba2caf578dca037f0eb759c81dc3896c607a1
25b2c5a63c am: de6666f95b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524 Change-Id: I6c76de4e9ad67db977159b84ba5e779f786a7a9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am:
25b2c5a63c am: de6666f95b
Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am:
85ca6e6a5e am: 7db8aed96c
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%