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
This commit is contained in:
Jean-Baptiste Queru 2013-03-11 13:00:54 -07:00 committed by Android Git Automerger
commit f909440149

Diff content is not available