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