am e426005b
: (-s ours) am e7a5966a
: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'e426005beb233748d866ce7eb2515f4388ac1da2':
This commit is contained in: