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