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