Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde
am: be40af59d7
am: 78464f29ef
am: 3bc9c2d28f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825 Change-Id: I9f4b6a34b16e3ec9da42eeaecdd6c0dd21a2abf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: