Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
am: 2318405bcb
am: 8ee78e05e7
am: e1ba18cbd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829 Change-Id: I5ebc2605ed55563850a8c65c4e18365ff327a29e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: