Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / vendor / nxp / opensource / packages / apps / Nfc / 57065aae3bf6beca33230e5e4082701b9001dfb8
  1. 57065aa Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  2. e6c925f am 066cd6df: (-s ours) am f6686c27: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  3. 066cd6d am f6686c27: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  4. fd57169 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  5. f6686c2 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  6. cd1f6fe am 180562b0: (-s ours) am 24bd050e: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  7. 180562b am 24bd050e: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  8. 555f21c Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  9. 24bd050 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  10. db4c5ae am d560e24e: am f4392711: Add watchdog to applyRouting(). by Martijn Coenen · 12 years ago
  11. d560e24 am f4392711: Add watchdog to applyRouting(). by Martijn Coenen · 12 years ago
  12. f439271 Add watchdog to applyRouting(). by Martijn Coenen · 12 years ago
  13. c2c8f3e am 72b19e1f: (-s ours) am 5c1c4487: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  14. 72b19e1 am 5c1c4487: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  15. ad8b3e1 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  16. 5c1c448 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  17. c4324b2 am f7f7996c: (-s ours) am 932c012a: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  18. f7f7996 am 932c012a: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  19. b1b27d3 Merge "Import translations. DO NOT MERGE" by Eric Fischer · 12 years ago
  20. 7715759 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  21. 932c012 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  22. 25c48f3 am 1738f4ae: Reconcile with jb-release by The Android Open Source Project · 12 years ago
  23. 1738f4a Reconcile with jb-release by The Android Open Source Project · 12 years ago
  24. 51ea9c8 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  25. 54088ae Merge "Import translations. DO NOT MERGE" by Eric Fischer · 12 years ago
  26. 7766db8 am 78620a76: (-s ours) am 2b08c897: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  27. 78620a7 am 2b08c897: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  28. ab0bde9 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  29. 2b08c89 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  30. a520958 am ff4263e1: Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  31. ff4263e Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  32. 77d363b merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  33. fadd67f am 62a89973: am d0387061: Merge "Use new handover intent actions." into jb-dev by Martijn Coenen · 12 years ago
  34. 62a8997 am d0387061: Merge "Use new handover intent actions." into jb-dev by Martijn Coenen · 12 years ago
  35. d038706 Merge "Use new handover intent actions." into jb-dev by Martijn Coenen · 12 years ago
  36. f2509ed am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get fails." into jb-dev by Martijn Coenen · 12 years ago
  37. abf67e1 am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get fails." into jb-dev by Martijn Coenen · 12 years ago
  38. 423cc45 Merge "Fall back to NDEF push if handover SNEP get fails." into jb-dev by Martijn Coenen · 12 years ago
  39. e8ea487 am f1566deb: (-s ours) am b2753981: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  40. f1566de am b2753981: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  41. ff99548 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  42. b275398 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  43. 4fe787c Use new handover intent actions. by Martijn Coenen · 12 years ago
  44. a3715d1 Fall back to NDEF push if handover SNEP get fails. by Martijn Coenen · 12 years ago
  45. 61d1553 merge in nakasi-factoryrom-release history after reset to jb-dev by The Android Automerger · 12 years ago
  46. ba2ed2d am 085bde96: Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  47. 085bde9 Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  48. 5328237 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  49. d5b8a6f am 7d44aa52: am befa3d6d: Show time in NFC handover notifications. by Martijn Coenen · 12 years ago
  50. dfd9b1d am 3309445e: am 973ff9be: Fix some strings. by Martijn Coenen · 12 years ago
  51. 7d44aa5 am befa3d6d: Show time in NFC handover notifications. by Martijn Coenen · 12 years ago
  52. 3309445 am 973ff9be: Fix some strings. by Martijn Coenen · 12 years ago
  53. befa3d6 Show time in NFC handover notifications. by Martijn Coenen · 12 years ago
  54. 973ff9b Fix some strings. by Martijn Coenen · 12 years ago
  55. 78d8c71 am 5dccb9a4: Reconcile with jb-release by The Android Open Source Project · 12 years ago
  56. 4e7ef69 merge in nakasi-factoryrom-release history after reset to jb-dev by The Android Automerger · 12 years ago
  57. 5dccb9a Reconcile with jb-release by The Android Open Source Project · 12 years ago
  58. 88f8a4d am 67038a30: Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  59. 2598c16 am beb7b1b4: am 0de27370: Bluetooth Beam: generate unique filenames. by Martijn Coenen · 12 years ago
  60. d47de4a am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover. by Martijn Coenen · 12 years ago
  61. 4e72938 am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." into jb-dev by Martijn Coenen · 12 years ago
  62. 5bc9a1d am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev by Martijn Coenen · 12 years ago
  63. 2f207c3 am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev by Craig Mautner · 12 years ago
  64. e9d4edb merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  65. 67038a3 Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  66. beb7b1b am 0de27370: Bluetooth Beam: generate unique filenames. by Martijn Coenen · 12 years ago
  67. 91ebf1e am 0f2b555f: Don\'t use NPP for connection handover. by Martijn Coenen · 12 years ago
  68. 0de2737 Bluetooth Beam: generate unique filenames. by Martijn Coenen · 12 years ago
  69. 0f2b555 Don't use NPP for connection handover. by Martijn Coenen · 12 years ago
  70. f3a3859 merge in nakasi-factoryrom-release history after reset to jb-dev by The Android Automerger · 12 years ago
  71. e769540 am 1179ee22: Merge "Close NFCEE when NFC is being shut down." into jb-dev by Martijn Coenen · 12 years ago
  72. 1179ee2 Merge "Close NFCEE when NFC is being shut down." into jb-dev by Martijn Coenen · 12 years ago
  73. 83eb691 Eliminate obsolete flag. by Craig Mautner · 12 years ago
  74. 8a704e7 am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev by Martijn Coenen · 12 years ago
  75. 0b61093 am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev by Martijn Coenen · 12 years ago
  76. 2aa9b46 Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev by Martijn Coenen · 12 years ago
  77. 4ac28aa Close NFCEE when NFC is being shut down. by Martijn Coenen · 12 years ago
  78. c9f617a am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev by Craig Mautner · 12 years ago
  79. b0f96e9 Merge "Eliminate obsolete flag." into jb-dev by Craig Mautner · 12 years ago
  80. d551755 Eliminate obsolete flag. by Craig Mautner · 12 years ago
  81. 6c6de7b resolved conflicts for merge of c989f25d to master by Justin Koh · 12 years ago
  82. c989f25 Don't instantiate sendUi in Nfc if we are in appliance mode. by Justin Koh · 12 years ago
  83. 24d533e merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  84. 3bf04bd Allow cancelling of Bluetooth Beam transfers. by Martijn Coenen · 12 years ago
  85. 8baa916 am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev by Martijn Coenen · 12 years ago
  86. 05d74c9 Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev by Martijn Coenen · 12 years ago
  87. 1f475dc am 2e0f3b1a: Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  88. 2e0f3b1 Reconcile with jb-release nakasi-factoryrom-release by The Android Open Source Project · 12 years ago
  89. dbaa3f2 merge in nakasi-factoryrom-release history after reset to jb-dev by The Android Automerger · 12 years ago
  90. 9f3c1e2 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  91. 402da07 Bluetooth Beam handover: deal with multi-file transfers. by Martijn Coenen · 12 years ago
  92. 158bfe2 am 8a3c4e8b: (-s ours) am 4942be03: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  93. 8a3c4e8 am 4942be03: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  94. a5df0de Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  95. 4942be0 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  96. 7bd827b merge in nakasi-factoryrom-release history after reset to jb-dev by The Android Automerger · 12 years ago
  97. 7853595 merge in jb-release history after reset to jb-dev by The Android Automerger · 12 years ago
  98. dad1994 am ab2ca834: (-s ours) am d764350f: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  99. ab2ca83 am d764350f: Import translations. DO NOT MERGE by Eric Fischer · 12 years ago
  100. 58ead98 Import translations. DO NOT MERGE by Eric Fischer · 12 years ago