| commit | 39ca4e1d8fa7b096482465028f32cfd3f9396928 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Wed Oct 17 20:50:27 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 17 20:50:27 2012 -0700 |
| tree | c349b70887cb1bdaaa47b9c05158eaeb842b766e | |
| parent | d272fe70e564e93a59d109446f3e81cbd6a02e7f [diff] | |
| parent | 55b6853572227b26fbe00681fa00a278da15e588 [diff] |
Merge "Manta: NFC: Re-enable Listen-F active." into jb-mr1-dev