Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
am: 921b1f6a6f
am: 52414ae87d
am: 35f8f17484
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339 Change-Id: I936eba8b11dc0698284e15324a1a74c96c3cec8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: