tree c8ddc9c6ed05ced06ef06dbe55120a2c2518d527
parent 6a7a324502e34e10830806751efbc514014815ee
parent 92b2cd23f708c9aeed146e995807dce080b57d1a
author Jean-Baptiste Queru <jbq@google.com> 1363030091 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030091 -0700

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

* commit '92b2cd23f708c9aeed146e995807dce080b57d1a':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library