tree 936b89056ccdc25e76265303000314e4e96a47f2
parent 5197d28bf2e26e861d68d2a9fd8da0a0b55a3f96
parent d971fd4b18fc9958b72372da046d5c87473c2e3b
author The Android Open Source Project <initial-contribution@android.com> 1361569536 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361569536 -0800

am d971fd4b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd971fd4b18fc9958b72372da046d5c87473c2e3b':
  mako: reduce the power consumption in off-mode charging
  mako: allow device to sleep in off-mode charging