tree cdc36ff5d283f0aaf2f44b24b6254a5099d3364b
parent 990ac5294477fe3f427ef0a12caba68119ce0ea3
parent d6a5f2dff9c9db3e154a461127a7cfcea05c1f90
author Jean-Baptiste Queru <jbq@google.com> 1283284055 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283284055 -0700

am d6a5f2df: am d3e803ae: Revert "Shutdown when capacity is 0% and no charging or when battery is dead"

Merge commit 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90'

* commit 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90':
  Revert "Shutdown when capacity is 0% and no charging or when battery is dead"