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