Merge "Update incompatible charging string for different product" into udc-dev am: 36d78f8fe0
am: 9550f8b0fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988525 Change-Id: I5a576e80ea56696b70142604ed25c80046b0cf00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: