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