1. 856d765 Revert "Added addr field in response of Jewel command" by Martijn Coenen · 12 years ago jb-mr0-release jb-release android-4.1.1_r1 android-4.1.1_r1.1 android-4.1.1_r2 android-4.1.1_r3 android-4.1.1_r4 android-4.1.1_r5 android-4.1.1_r6 android-4.1.1_r6.1 android-4.1.2_r1 android-4.1.2_r2 android-4.1.2_r2.1
  2. 67d9f85 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  3. 144d72d Remove some logs in case of abort() (DO NOT MERGE). by Martijn Coenen · 12 years ago
  4. cd4cc50 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  5. ba04075 Fix wrong extern variable size by Sunil Jogi · 12 years ago
  6. 7f35701 merge in jb-release history after reset to master by The Android Automerger · 12 years ago
  7. 9d5e635 Merge "Added recovery function when SE wired mode selected" by Martijn Coenen · 12 years ago
  8. cbd3e8d Add NOTICE and MODULE_LICENSE_APACHE files by Wei Zhong · 12 years ago
  9. 8cd94e7 Fix T2T makeReadonly. by Martijn Coenen · 12 years ago
  10. 8655989 merge in jb-release history after reset to master by The Android Automerger · 12 years ago
  11. c0da27e Added addr field in response of Jewel command by Sunil Jogi · 13 years ago
  12. 8206325 Added recovery function when SE wired mode selected by Sunil Jogi · 12 years ago
  13. 1f50a3a merge in jb-release history after reset to master by The Android Automerger · 12 years ago
  14. c3a8731 Added support for tearing recovery for MIFARE Classic Readonly by Sunil Jogi · 13 years ago
  15. 40734e7 Mifare readonly support. by Sunil Jogi · 13 years ago
  16. eb6da80 Patch to support MIFARE with SAK 0x01 by Sunil Jogi · 13 years ago
  17. cadb46b Empty merge of a remote-tracking branch by Mike Lockwood · 13 years ago
  18. 3b217a9 merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  19. 3dae9e4 merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  20. de654ff merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  21. 25aa129 Don't dump nfc target/initiator modes to system log. by Martijn Coenen · 13 years ago
  22. a581a5b merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  23. c67f72f Replace loge with aloge. by Ramanan Rajeswaran · 13 years ago
  24. eee41c4 am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread. by Rakesh Goyal · 13 years ago
  25. da7d267 am 3f791036: nfc-hal: generalize error handling in Reader thread. by Rakesh Goyal · 13 years ago
  26. 3f79103 nfc-hal: generalize error handling in Reader thread. by Rakesh Goyal · 13 years ago
  27. b87584e merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  28. ffc175e am bbda0171: am 65ce3454: Merge "Fix one coding error of using a temporary variable in the global structure NdefMap" by Nick Pelly · 13 years ago
  29. bbda017 am 65ce3454: Merge "Fix one coding error of using a temporary variable in the global structure NdefMap" by Nick Pelly · 13 years ago
  30. 65ce345 Merge "Fix one coding error of using a temporary variable in the global structure NdefMap" by Nick Pelly · 13 years ago ics-plus-aosp tools_r20 android-sdk-adt_r20
  31. daf44bb merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  32. 21e3ef1 Support for handling of proprietry TLV in T4T by Sunil Jogi · 13 years ago
  33. 3013fc7 Skip proprietry TLV for Type 2 by Sunil Jogi · 13 years ago
  34. cfe68fa merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  35. d5dae5f Fix one coding error of using a temporary variable in the global structure NdefMap by Jack Ren · 13 years ago
  36. 20b7bd5 (DEBUG) Add support for setting p2p modes. by Martijn Coenen · 13 years ago
  37. 582cf5a DO NOT MERGE by Mike J. Chen · 13 years ago
  38. 590a7b5 merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  39. 6bd5058 Fix NFCSTATUS_BUSY responses after doing p2p. by Martijn Coenen · 13 years ago
  40. 146a808 Merge "Fixed FRMR sending on invalid LLCP frame received" by Martijn Coenen · 13 years ago
  41. ce7e880 Fixed FRMR sending on invalid LLCP frame received by Sunil Jogi · 13 years ago
  42. 7ae3a34 am 700428d8: am 8c56cd9e: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  43. 700428d am 8c56cd9e: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  44. 8c56cd9 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  45. d42dbf5 merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  46. 177497f Handle inbound buffering in LLCP connectionless sockets by Sunil Jogi · 13 years ago
  47. 00485a3 Fixed rejected receive request in LLCP by Sunil Jogi · 13 years ago
  48. 2ee7157 Fixed wrong callbacks call by Sunil Jogi · 13 years ago
  49. 5426980 merge in jb-release history after reset to master by The Android Automerger · 13 years ago
  50. 4bbf618 Increase internal LLCP buffers to fit max MIU by Sunil Jogi · 13 years ago
  51. ffdbd5c Reset LLCP socket internal variables before next use. by Sunil Jogi · 13 years ago
  52. 49adea7 Update for LLCP V(SA) internal variable by Sunil Jogi · 13 years ago
  53. d25018d LLCP 1.1: Fix some bugs. by Martijn Coenen · 13 years ago
  54. 32060a1 Adding support for handling maximum length supported by peer by Sunil Jogi · 13 years ago
  55. 7b187e7 LLCP 1.1 implementation. by Sunil Jogi · 13 years ago
  56. 955a8ef LLCP 1.1: allow pending operations on connectionless. by Sunil Jogi · 13 years ago
  57. ef34f9e merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  58. 1f399b2 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  59. 3a53a1e Don't overwrite psUpperLayerContext when reconfiguring the SE. by Martijn Coenen · 13 years ago
  60. 78b4597 Clear out send/recv callbacks for connectionless sockets. by Martijn Coenen · 13 years ago
  61. 2d3c9c7 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  62. 5630038 Prevent LLCP stack from deactiving twice. by Martijn Coenen · 13 years ago
  63. b90f346 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  64. 4eacaed merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  65. a12acb1 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 13 years ago
  66. 113bdd7 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 13 years ago
  67. 7acd54c merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  68. 1f23e48 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE by Steve Block · 13 years ago
  69. 63ae766 am 593d6d4a: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  70. 593d6d4 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  71. 60ccd43 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  72. aa359b6 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  73. 533c144 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago ics-mr1-release android-4.0.3_r1 android-4.0.3_r1.1 android-4.0.4_r1 android-4.0.4_r1.1 android-4.0.4_r1.2 android-4.0.4_r2 android-4.0.4_r2.1
  74. 644d92a am b99be65c: Use NFC HAL for some libnfc settings. by Martijn Coenen · 13 years ago
  75. c2d19fe am b99be65c: Use NFC HAL for some libnfc settings. by Martijn Coenen · 13 years ago
  76. b99be65 Use NFC HAL for some libnfc settings. by Martijn Coenen · 13 years ago ics-mr1 android-cts-4.0.3_r1 android-cts-4.0.3_r2 android-cts-verifier-4.0.3_r1 android-cts-verifier-4.0_r1 android-sdk-4.0.3-tools_r1 android-sdk-4.0.3_r1
  77. 6d584d1 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  78. 7485e83 keep previous history after reset to mr1 plus aah changes (ics-aah-wip) by Ed Heyl · 13 years ago
  79. af0d802 undo reset to ics-mr1 until we have a better method by Ed Heyl · 13 years ago
  80. 4c4ab94 reset to ics-mr1, but keep history by Ed Heyl · 13 years ago
  81. dfe647f merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  82. 0dda60d am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1 by Ed Heyl · 13 years ago
  83. 1fd31d6 am b13b27aa: Use a 10s timeout in uart_read() in FW download mode. by Nick Pelly · 13 years ago
  84. 9fef86a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  85. 3662381 Merge remote branch 'goog/ics-mr0' into ics-mr1 by Ed Heyl · 13 years ago
  86. b13b27a Use a 10s timeout in uart_read() in FW download mode. by Nick Pelly · 13 years ago
  87. 18985d0 Use a 10s timeout in uart_read() in FW download mode. by Nick Pelly · 13 years ago ics-factoryrom-2-release ics-mr0 ics-mr0-release android-4.0.1_r1 android-4.0.1_r1.1 android-4.0.1_r1.2 android-4.0.2_r1 android-cts-4.0_r1 android-sdk-adt_r16.0.1
  88. a32af9d merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  89. 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
  90. ff39bc6 am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 by Martijn Coenen · 13 years ago
  91. 17abc6e Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 by Martijn Coenen · 13 years ago
  92. 5ea62ad Fixes to LLC and DAL to handle unreliable UART. by Nick Pelly · 13 years ago
  93. bb6fce1 Remove NFC I2C workaround for Prime (DO NOT MERGE). by Martijn Coenen · 13 years ago
  94. b05ebee merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  95. 31e4d8b am 6dd94832: Manual port of 6900b4 from gingerbread: by Rob von Behren · 13 years ago
  96. 6dd9483 Manual port of 6900b4 from gingerbread: by Rob von Behren · 13 years ago
  97. f3c6581 Reconcile with gingerbread-release gingerbread-mr4-release by The Android Open Source Project · 13 years ago
  98. 2f293c7 am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp by Jeff Hamilton · 13 years ago
  99. 952686e merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  100. d531c36 keep history after reset to GRK39D by Ed Heyl · 13 years ago gingerbread-release android-2.3.6_r1