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