tree b74eb636c52dde04696328a918b2f7d9036b438e
parent 20933656ad007cf18e5fc5337caf0eb6bb31f688
parent 97a79323334513397ccf5cb5c1bb218d41d707e1
author Jean-Baptiste Queru <jbq@google.com> 1363030096 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030096 -0700

am 97a79323: am ff01f6e3: (-s ours) am 5cefac4a: (-s ours) Reconcile with jb-mr1-release - do not merge

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