tree 81bf5c7b078f9d55e570b2d39e02d2213a298926
parent bb24672e9751143a15b8004585645ae4a3a54b73
parent 0385e3e908fb9988bb2d2d0d15e32cb6a819b34e
author Dianne Hackborn <hackbod@google.com> 1439002181 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439002181 +0000

am 0385e3e9: am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev

* commit '0385e3e908fb9988bb2d2d0d15e32cb6a819b34e':
  Fix issue #22989030: Separate battery whitelists