| commit | edc7f3a309478775bb821d5e2489f08cfe6b486e | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Jun 28 00:43:20 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 28 00:43:20 2013 +0000 |
| tree | 4e725b6066f00c9ac9ca508e830276907d6347b4 | |
| parent | 39c6a8f40238b4449d8cbe3cd041b07cac26091f [diff] | |
| parent | 319a5b06d702f2f51cf4274535166ce670aaefc5 [diff] |
Merge "Flo: NFC: Load pre-firmware, re-enable Nfc-A/Nfc-F active." into jb-mr2-dev