From: Jason Monk <jmonk@google.com>
Date: Fri, 24 Jul 2015 03:10:07 +0000 (+0000)
Subject: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into... 
X-Git-Tag: android-x86-7.1-r1~1317^2~2^2~204
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9b97364157c83ed9823f323e2f515bc2e5fc8be;p=android-x86%2Fpackages-apps-Settings.git

am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
  Fix battery detail issues with "Android OS"
---

e9b97364157c83ed9823f323e2f515bc2e5fc8be