Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
am: ef264fb304
am: 31d2f2b70c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181 Change-Id: Ie462815406032953ba0d7d2e0e40d9e6c80dcd8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: