diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:28:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:28:11 -0700 |
| commit | 09b43645514669b3ff8181b0a111bc14576e3699 (patch) | |
| tree | c8ddc9c6ed05ced06ef06dbe55120a2c2518d527 | |
| parent | 6a7a324502e34e10830806751efbc514014815ee (diff) | |
| parent | 92b2cd23f708c9aeed146e995807dce080b57d1a (diff) | |
| download | system_core-09b43645514669b3ff8181b0a111bc14576e3699.zip system_core-09b43645514669b3ff8181b0a111bc14576e3699.tar.gz system_core-09b43645514669b3ff8181b0a111bc14576e3699.tar.bz2 | |
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
0 files changed, 0 insertions, 0 deletions