From: Dianne Hackborn <hackbod@google.com>
Date: Sat, 8 Aug 2015 02:49:34 +0000 (+0000)
Subject: am 81a3ef13: am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue... 
X-Git-Tag: android-x86-7.1-r1~2147
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb8d922c37f69ca01dfe58219ded4b6c30d6c42d;p=android-x86%2Fpackages-apps-Settings.git

am 81a3ef13: am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit '81a3ef139b3f607562b784430fe2748f3eff9713':
  Fix issue #23037720: New Battery Optimization Strings
---

eb8d922c37f69ca01dfe58219ded4b6c30d6c42d