tree 31b372d59925a148239f02fd83864bebf007b298
parent 7dff1a72146ba549d51649ad786a0e1cc8b6897c
parent 1429f465f42bb9e3ef3ecfd1ee9af214901fc999
author Imre Sunyi <imre.sunyi@sonyericsson.com> 1283200096 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283200096 -0700

am 1429f465: am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead

Merge commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999'

* commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999':
  Shutdown when capacity is 0% and no charging or when battery is dead