bc393400b4e2690d5d25ffaadedf190eea2f412b
47cedbde0a am: f3012c6497 -s ours am: 7cb164d0c1 -s ours am: 69b0c4fe50 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025
Change-Id: I22b8cc9f2031597e536872eb1f93f7010bdb45bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am:
ffd306e63a am: 4759c9447f
Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am:
4c3ac9b994 am: 4afe665577
…
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%