tree f03524c037979bcf334a7b36b08d9bc9e13de1c1
parent 6711f76d244b22d8c39c33963d2d81504816eaf4
parent 75f29709af6d053168402dd12cdf8b0a58b0c35e
author Jean-Baptiste Queru <jbq@google.com> 1363032054 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032054 -0700

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

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