| commit | ee2840231ce60fcc7ae2f0fa045ffa94a2877c90 | [log] [tgz] |
|---|---|---|
| author | Vikram Aggarwal <viki@google.com> | Mon Oct 29 15:14:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 29 15:14:23 2012 -0700 |
| tree | 17ee0d63e4521ea97380f455e8cc34e9d1bd3326 | |
| parent | 910fe0479a07df0f3a2eaeee4d1191c9f32ea5c9 [diff] | |
| parent | 8d028a87e97f9420f9db31a6b8aa80859fe393b3 [diff] |
am 8d028a87: Allow wireless charging during encrypt * commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3': Allow wireless charging during encrypt