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