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