tree 6756394e6209940176d5fa27ff07f5f6c6250d94
parent ea42aa19e84a2e971f4a4406e55653fe9e7cc5ad
parent 9b6a0e04ec56d36a935c6f045c24639f33b75b7b
author Nick Kralevich <nnk@google.com> 1402599669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402599669 +0000

am 9b6a0e04: (-s ours) am 1b81aefa: Merge "Run the charger in the healthd domain."

* commit '9b6a0e04ec56d36a935c6f045c24639f33b75b7b':
  Run the charger in the healthd domain.