| commit | 8f5c1cdafd7085a2561802a30036e81f3e7a35c0 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Nov 30 13:25:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 30 13:25:51 2012 -0800 |
| tree | bf7174f88d78a17b284ce73c20c471e329f539d7 | |
| parent | 2387c9cec8fdaf5eb033a021778b802b2eab18b4 [diff] | |
| parent | 4d4f6e4de9c7d112d59abf4aced014c78c40d857 [diff] |
am 4d4f6e4d: am b16eb607: am fbe92043: Merge "Mako: NFC: Set pre-poweroff timeout to 10ms." into jb-mr1.1-dev * commit '4d4f6e4de9c7d112d59abf4aced014c78c40d857': Mako: NFC: Set pre-poweroff timeout to 10ms.