1. 89344e0 Import translations. DO NOT MERGE by Eric Fischer · 13 years ago
  2. 32c5203 Merge "Implement NFC-BT handover for Bluetooth headsets, such as Nokia BH-505." by Nick Pelly · 13 years ago
  3. a2908a1 Implement NFC-BT handover for Bluetooth headsets, such as Nokia BH-505. by Nick Pelly · 13 years ago
  4. 0c39284 Support for setting p2p modes from javaland and some cleanup. by Martijn Coenen · 13 years ago
  5. 51c2c8f Merge "Fix crash when disabling NFC with target in field." by Martijn Coenen · 13 years ago
  6. 9a93cf5 Fix crash when disabling NFC with target in field. by Martijn Coenen · 13 years ago
  7. 13505b5 am 962460d1: am cd7cbe30: Merge "Remove a warning of mismatch arguments" by Jean-Baptiste Queru · 13 years ago
  8. 962460d am cd7cbe30: Merge "Remove a warning of mismatch arguments" by Jean-Baptiste Queru · 13 years ago
  9. cd7cbe3 Merge "Remove a warning of mismatch arguments" by Jean-Baptiste Queru · 13 years ago
  10. f08ddee Remove a warning of mismatch arguments by Chih-Wei Huang · 13 years ago
  11. ad867da am e288a8c8: Cache installed packages for sending SE broadcasts. by Martijn Coenen · 13 years ago
  12. e288a8c Cache installed packages for sending SE broadcasts. by Martijn Coenen · 13 years ago
  13. 676a61d am 3c71cf4f: Remove unused assets from packages/apps/Nfc. by Martijn Coenen · 13 years ago
  14. 3c71cf4 Remove unused assets from packages/apps/Nfc. by Martijn Coenen · 13 years ago
  15. bcecd89 am bd0b6c38: Use the new "appliance" ui mode configuration to determine whether to show nfc confirmation ui. by Joe Onorato · 13 years ago
  16. bd0b6c3 Use the new "appliance" ui mode configuration to determine whether to show nfc confirmation ui. by Joe Onorato · 13 years ago
  17. 05acb15 am fb42b9f2: Allow apps to selectively disable beam by Isaac Levy · 13 years ago
  18. fb42b9f Allow apps to selectively disable beam by Isaac Levy · 13 years ago
  19. b7f7b57 am 09251767: Merge "Use a buffer in connectionless sockets." by Martijn Coenen · 13 years ago
  20. 0925176 Merge "Use a buffer in connectionless sockets." by Martijn Coenen · 13 years ago
  21. c05ad3a am b44c4c1a: am 9a71876a: am e799fe33: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  22. b44c4c1 am 9a71876a: am e799fe33: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  23. 9a71876 am e799fe33: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  24. e799fe3 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  25. 42c765d Use a buffer in connectionless sockets. by Martijn Coenen · 13 years ago
  26. 955ff05 am f4a920c8: Merge "Fix advertised well-known services." by Martijn Coenen · 13 years ago
  27. f4a920c Merge "Fix advertised well-known services." by Martijn Coenen · 13 years ago
  28. c6aa7c1 Fix advertised well-known services. by Martijn Coenen · 13 years ago
  29. 9add7fe am 2a576dd1: Merge "LLCP 1.1 support." by Martijn Coenen · 13 years ago
  30. 2a576dd Merge "LLCP 1.1 support." by Martijn Coenen · 13 years ago
  31. 3b82eef LLCP 1.1 support. by Martijn Coenen · 13 years ago
  32. 92077cf am 4fce619a: Merge "Don\'t need to pass the NdefMessage in dispatch()." by Nick Pelly · 13 years ago
  33. 4fce619 Merge "Don't need to pass the NdefMessage in dispatch()." by Nick Pelly · 13 years ago
  34. 519d4af am 9556b23e: Merge "Import translations. DO NOT MERGE" by Eric Fischer · 13 years ago
  35. 9556b23 Merge "Import translations. DO NOT MERGE" by Eric Fischer · 13 years ago
  36. 4ba001b Import translations. DO NOT MERGE by Eric Fischer · 13 years ago
  37. ea78e5b Don't need to pass the NdefMessage in dispatch(). by Nick Pelly · 13 years ago
  38. 5ed1a61 am 550ef7b9: Merge "LLCP echo server implementation." by Martijn Coenen · 13 years ago
  39. 550ef7b Merge "LLCP echo server implementation." by Martijn Coenen · 13 years ago
  40. 0be4087 am 391cfe24: Rewrite NDEF dispatch path. It was getting pretty messy. by Nick Pelly · 13 years ago
  41. 391cfe2 Rewrite NDEF dispatch path. It was getting pretty messy. by Nick Pelly · 13 years ago
  42. 6f0e3b8 LLCP echo server implementation. by Martijn Coenen · 13 years ago
  43. 0f906f8 am 1a037ff4: Merge "Bring LLCP connectionless sockets back to life." by Martijn Coenen · 13 years ago
  44. 1a037ff Merge "Bring LLCP connectionless sockets back to life." by Martijn Coenen · 13 years ago
  45. e008eba Bring LLCP connectionless sockets back to life. by Martijn Coenen · 13 years ago
  46. b3c05cf am 0d23ad07: Merge "Make airplane override for NFC persistent." by Martijn Coenen · 13 years ago
  47. 0d23ad0 Merge "Make airplane override for NFC persistent." by Martijn Coenen · 13 years ago
  48. 1668f53 Make airplane override for NFC persistent. by Martijn Coenen · 13 years ago
  49. 48a2fd7 am afc8705e: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 13 years ago
  50. afc8705 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 13 years ago
  51. 558edad am 15be799e: Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 13 years ago
  52. 15be799 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 13 years ago
  53. 7983b3b am 128f32be: Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE by Steve Block · 13 years ago
  54. 128f32b Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE by Steve Block · 13 years ago
  55. e9da397 am 7d4e962f: Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE by Steve Block · 13 years ago
  56. 7d4e962 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE by Steve Block · 13 years ago
  57. a0e323d am 9bfa3a38: Import revised translations. by Eric Fischer · 13 years ago
  58. 9bfa3a3 Import revised translations. by Eric Fischer · 13 years ago
  59. 6689a7a am 86987aac: Merge "Always search for p2p target in discovery list." by Martijn Coenen · 13 years ago
  60. 86987aa Merge "Always search for p2p target in discovery list." by Martijn Coenen · 13 years ago
  61. 53b56cb Always search for p2p target in discovery list. by Martijn Coenen · 13 years ago
  62. 4eec55f am fd2cdbf1: Nfc: s/NFC JNI/NFCJNI/ in jni log tag. by mike wakerly · 13 years ago
  63. fd2cdbf Nfc: s/NFC JNI/NFCJNI/ in jni log tag. by mike wakerly · 13 years ago
  64. 3b95e73 am c9342fef: NfcService: some trivial cleanups. by mike wakerly · 13 years ago
  65. c9342fe NfcService: some trivial cleanups. by mike wakerly · 13 years ago
  66. 49fd739 am 47791cf2: LOG -> ALOG by Nick Pelly · 13 years ago
  67. 47791cf LOG -> ALOG by Nick Pelly · 13 years ago
  68. ed947be am b5a1f0fe: am 7948ab63: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  69. b5a1f0f am 7948ab63: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  70. 7948ab6 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  71. 3957268 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  72. 9298836 am 63a5c36f: am 985dcef8: Fix Beam&Tag failures after opening NFC-EE. by Nick Pelly · 13 years ago
  73. 63a5c36 am 985dcef8: Fix Beam&Tag failures after opening NFC-EE. by Nick Pelly · 13 years ago
  74. 985dcef Fix Beam&Tag failures after opening NFC-EE. by Nick Pelly · 13 years ago
  75. ab2e970 am e64c6520: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  76. e64c652 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  77. 3a8843a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  78. c08343a am 4df60d8e: am 16ac4580: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  79. 4df60d8 am 16ac4580: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  80. 16ac458 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  81. 218cc52 am eafd2eda: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  82. eafd2ed Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  83. 3f3cc18 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  84. 6d16db9 am a76d8ec1: resolved conflicts for merge of 92250f5c to master by Nick Pelly · 13 years ago
  85. a76d8ec resolved conflicts for merge of 92250f5c to master by Nick Pelly · 13 years ago
  86. 92250f5 Fix mismatched link()/unlink() causing NFC-EE to be stuck open. by Nick Pelly · 13 years ago
  87. ae27e48 am ebbf54bb: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  88. 1838d25 am e95ef63b: am 951dad2b: Restore deleted string still referenced from manifest. by Eric Fischer · 13 years ago
  89. ebbf54b Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  90. e95ef63 am 951dad2b: Restore deleted string still referenced from manifest. by Eric Fischer · 13 years ago
  91. 25e0d39 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  92. 951dad2 Restore deleted string still referenced from manifest. by Eric Fischer · 13 years ago
  93. 1fc599b merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  94. 4d49de0 am b2c4b38e: Merge "Import revised translations." by Eric Fischer · 13 years ago
  95. b2c4b38 Merge "Import revised translations." by Eric Fischer · 13 years ago
  96. e2cccc0 Import revised translations. by Eric Fischer · 13 years ago
  97. 5b7d95e am 2a3f6f14: Fix two incorrect synchronized statements. by mike wakerly · 13 years ago
  98. 2a3f6f1 Fix two incorrect synchronized statements. by mike wakerly · 13 years ago
  99. 1ae5e3a am a29693de: am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1 by Martijn Coenen · 13 years ago
  100. a29693d am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1 by Martijn Coenen · 13 years ago