| commit | 7799c2c04b2f9715b7a69c49406164818663bed5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:28:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:28:16 2013 -0700 |
| tree | b74eb636c52dde04696328a918b2f7d9036b438e | |
| parent | 20933656ad007cf18e5fc5337caf0eb6bb31f688 [diff] | |
| parent | 97a79323334513397ccf5cb5c1bb218d41d707e1 [diff] |
am 97a79323: am ff01f6e3: (-s ours) am 5cefac4a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '97a79323334513397ccf5cb5c1bb218d41d707e1': mako: reduce the power consumption in off-mode charging mako: allow device to sleep in off-mode charging