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