tree 74e584824f4d2c6e2900ffc28ce025e0cd035248
parent 04a8c257feec136eccf0957b09a49cdd88e4f35c
parent 40114d8cf1102ec1bde343c5d3be492b96a70131
author YUKAI HUNG <ykhung@google.com> 1619590353 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619590353 +0000

Merge "Update string for battery usage footer to include charging info" into sc-dev am: 40114d8cf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327007

Change-Id: Ie495e3a506a44cc1a97ac2f1d4fe16224b038475