am 6aeabbf2: (-s ours) am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit '6aeabbf2d2166e06ab742bdfaf94f0a9f383f891':
This commit is contained in:
Dianne Hackborn
2015-08-27 11:36:00 +00:00
committed by Android Git Automerger

Diff Content Not Available