tree b1eceb9a7f62e868f0820dddc5f2c8ea8cb62c16
parent ca8e67d1448db7e32d51e97f337978854309ae90
parent 33af17ff315f3179e016edd110a7e20dcdaf596a
author Android Build Prod User <android-build-prod@system.gserviceaccount.com> 1630015166 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630015166 +0000

Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309

Change-Id: Ie0d087c70691e9363126c096625e9ee4aab44a63