| commit | fbe920431fa719e93d33bdefaee29373eb7f70c2 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Nov 30 12:56:36 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 30 12:56:37 2012 -0800 |
| tree | 27932b686ac1c33d051f0a8833ca7989b69ca7d0 | |
| parent | cbf1c63a89d5d6fd34b0cb475533a8d9eef7d582 [diff] | |
| parent | b984dee6a55821ecc4801e39740c1a852537303b [diff] |
Merge "Mako: NFC: Set pre-poweroff timeout to 10ms." into jb-mr1.1-dev