Google Git
Sign in
ara-mdk / platform / external / libnfc-nxp / HEAD
  1. 63ae766 am 593d6d4a: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  2. 593d6d4 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  3. 60ccd43 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  4. aa359b6 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  5. 533c144 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  6. 644d92a am b99be65c: Use NFC HAL for some libnfc settings. by Martijn Coenen · 13 years ago
  7. c2d19fe am b99be65c: Use NFC HAL for some libnfc settings. by Martijn Coenen · 13 years ago
  8. b99be65 Use NFC HAL for some libnfc settings. by Martijn Coenen · 13 years ago
  9. 6d584d1 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  10. 7485e83 keep previous history after reset to mr1 plus aah changes (ics-aah-wip) by Ed Heyl · 13 years ago
  11. af0d802 undo reset to ics-mr1 until we have a better method by Ed Heyl · 13 years ago
  12. 4c4ab94 reset to ics-mr1, but keep history by Ed Heyl · 13 years ago
  13. dfe647f merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  14. 0dda60d am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1 by Ed Heyl · 13 years ago
  15. 1fd31d6 am b13b27aa: Use a 10s timeout in uart_read() in FW download mode. by Nick Pelly · 13 years ago
  16. 9fef86a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  17. 3662381 Merge remote branch 'goog/ics-mr0' into ics-mr1 by Ed Heyl · 13 years ago
  18. b13b27a Use a 10s timeout in uart_read() in FW download mode. by Nick Pelly · 13 years ago
  19. 18985d0 Use a 10s timeout in uart_read() in FW download mode. by Nick Pelly · 13 years ago
  20. a32af9d merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  21. 49bcf5f am ff39bc6d: (-s ours) am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 by Martijn Coenen · 13 years ago
  22. ff39bc6 am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 by Martijn Coenen · 13 years ago
  23. 17abc6e Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 by Martijn Coenen · 13 years ago
  24. 5ea62ad Fixes to LLC and DAL to handle unreliable UART. by Nick Pelly · 13 years ago
  25. bb6fce1 Remove NFC I2C workaround for Prime (DO NOT MERGE). by Martijn Coenen · 13 years ago
  26. b05ebee merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  27. 31e4d8b am 6dd94832: Manual port of 6900b4 from gingerbread: by Rob von Behren · 13 years ago
  28. 6dd9483 Manual port of 6900b4 from gingerbread: by Rob von Behren · 13 years ago
  29. f3c6581 Reconcile with gingerbread-release gingerbread-mr4-release by The Android Open Source Project · 13 years ago
  30. 2f293c7 am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp by Jeff Hamilton · 13 years ago
  31. 952686e merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  32. d531c36 keep history after reset to GRK39D by Ed Heyl · 13 years ago
  33. 71b688d Merge commit 'df34eb0e' into manualmerge by Jeff Hamilton · 13 years ago
  34. f9c00ef keep history after reconcile of gingerbread-release by The Android Automerger · 13 years ago
  35. df674e5 am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp by Jeff Hamilton · 13 years ago
  36. bcc8233 resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp by Jeff Hamilton · 13 years ago
  37. f99b85b keep history by android-merger · 13 years ago
  38. df34eb0 am dd163fe4: am df82c4dd: Patch to add an API to load a FW image in the libnfc by Daniel TOMAS · 13 years ago
  39. dd163fe am df82c4dd: Patch to add an API to load a FW image in the libnfc by Daniel TOMAS · 13 years ago
  40. 6900b4e Patch to add Secure Download Mechanism in the libnfc by Daniel TOMAS · 13 years ago
  41. df82c4d Patch to add an API to load a FW image in the libnfc by Daniel TOMAS · 13 years ago
  42. ba22b1e merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  43. 76a56ba Merge "Felica system code related changes" by Martijn Coenen · 13 years ago
  44. 3c78393 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  45. 868cc2d Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. by Daniel Tomas · 14 years ago
  46. e13ca0d Fix for removing unnecessary DESELECT before P2P activation in case by Sunil Jogi · 13 years ago
  47. 365ec87 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  48. 5b80cbb Revert "Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc." by Nick Pelly · 13 years ago
  49. 5d849c9 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  50. 3903838 Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. by Daniel Tomas · 14 years ago
  51. dd7125f Felica system code related changes by Sunil Jogi · 14 years ago
  52. 34af960 Reconcile with gingerbread-mr4-release by The Android Open Source Project · 14 years ago
  53. cfa5e67 merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  54. 34093f2 ISO15693 Format fix by Sunil Jogi · 14 years ago
  55. c7643ea Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release by The Android Automerger · 14 years ago
  56. 6eca74b merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  57. e24fff5 Reconcile with gingerbread-mr4-release by The Android Open Source Project · 14 years ago
  58. 4ae1db7 Print a warning message on NXP_EVT_INFO_MEM_VIOLATION. by Nick Pelly · 14 years ago
  59. 979c4c6 Merge "Don't wait for timeout to send SYMM PDU's." by Martijn Coenen · 14 years ago
  60. 54b847c Don't wait for timeout to send SYMM PDU's. by Martijn Coenen · 14 years ago
  61. ffb3400 merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  62. 9ce2972 am 6c66debf: am af5fad81: am 90604ed6: Merge "Merge from gingerbread" by Jean-Baptiste Queru · 14 years ago
  63. 57d2464 Add the ability to enable LLCP logging. by Jeff Hamilton · 14 years ago
  64. 5dcc073 merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  65. f70efa7 Merge "Fixed LLCP receive function when accessing RW." by Martijn Coenen · 14 years ago
  66. cdfcf68 Merge "Deal with LLCP send errors properly (part 1)." by Martijn Coenen · 14 years ago
  67. 6c66deb am af5fad81: am 90604ed6: Merge "Merge from gingerbread" by Jean-Baptiste Queru · 14 years ago
  68. af5fad8 am 90604ed6: Merge "Merge from gingerbread" by Jean-Baptiste Queru · 14 years ago
  69. 90604ed Merge "Merge from gingerbread" by Jean-Baptiste Queru · 14 years ago
  70. 9d52bfc Merge from gingerbread by Jean-Baptiste Queru · 14 years ago
  71. 3792627 Fixed LLCP receive function when accessing RW. by Sylvain Fonteneau · 14 years ago
  72. cb9d6b8 am 0c4a5508: am d8b82bee: am 34caeca8: Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 14 years ago
  73. 4510126 Deal with LLCP send errors properly (part 1). by Martijn Coenen · 14 years ago
  74. fbff1ec Factorized and fixed code for automatic LLCP socket binding. by Sylvain Fonteneau · 14 years ago
  75. 0c4a550 am d8b82bee: am 34caeca8: Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 14 years ago
  76. 67d73fb Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 14 years ago
  77. 3002430 Increase number of LLCP sockets from 5 to 10. by Martijn Coenen · 14 years ago
  78. 34b094c merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  79. d8b82be am 34caeca8: Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 14 years ago
  80. 0c4bea9 Reconcile with gingerbread-mr4-release by The Android Open Source Project · 14 years ago
  81. e6d37e0 merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  82. 2b72906 Merge "getTimeout() support in libnfc-nxp." by Martijn Coenen · 14 years ago
  83. b783229 getTimeout() support in libnfc-nxp. by Martijn Coenen · 14 years ago
  84. 336565c merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  85. 8c9b94d Latest phDnldNfc.c code from NXP. by Nick Pelly · 14 years ago
  86. 968e432 merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  87. 9be5ac5 Reconcile with gingerbread-release by The Android Open Source Project · 14 years ago
  88. 2c2530b merge in ics-release history after reset to master by The Android Automerger · 14 years ago
  89. 1398dc3 Revert "Patch to decrease the maximum packet size for NFC firmware download" by Nick Pelly · 14 years ago
  90. 8e65f6b Revert "Patch to decrease the maximum packet size for NFC firmware download" by Nick Pelly · 14 years ago
  91. 193b150 Disable read() timeout. by Nick Pelly · 14 years ago
  92. 34caeca Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 14 years ago
  93. 709ed1d Merge "Delay 5ms after FW SW reset command due to clock instability." by Nick Pelly · 14 years ago
  94. f15b457 Delay 5ms after FW SW reset command due to clock instability. by Nick Pelly · 14 years ago
  95. 6c3019d reset back to latest, and keep history by android-merger · 14 years ago
  96. 23a22e9 am 47de55ab: am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp by David 'Digit' Turner · 14 years ago
  97. 294b456 Patch to decrease the maximum packet size for NFC firmware download by Daniel Tomas · 14 years ago
  98. 7def4be temp reset to 39, and keep history by android-merger · 14 years ago
  99. 47de55a am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp by David 'Digit' Turner · 14 years ago
  100. 0ca6912 resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp by David 'Digit' Turner · 14 years ago