| commit | ff316c085dcd28ae1f5e23fd2a92adfc8aa6e258 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Oct 01 14:02:33 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 01 14:02:33 2012 -0700 |
| tree | 3e7344ff74c497fc2db2a7deb9d0d2ad18c08e35 | |
| parent | af77dd13196b8e33a19df60ed9713422495a0431 [diff] | |
| parent | d4abde60fd151f81cf464abe405ba7919a772988 [diff] |
Merge "Manta: NFC: Disable 424 active in listen mode." into jb-mr1-dev