| commit | 75f29709af6d053168402dd12cdf8b0a58b0c35e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:27 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:27 2013 -0700 |
| tree | c8ddc9c6ed05ced06ef06dbe55120a2c2518d527 | |
| parent | 6a7a324502e34e10830806751efbc514014815ee [diff] | |
| parent | 09b43645514669b3ff8181b0a111bc14576e3699 [diff] |
am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '09b43645514669b3ff8181b0a111bc14576e3699': charger: Do not suspend when disconnecting from charger charger: suspend enable in charger mode libsuspend: compile as a static library