Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / vendor / nxp / opensource / packages / apps / Nfc / e95ef63bb6fd08bda1d144d5e6959c97b1c29cc1
  1. e95ef63 am 951dad2b: Restore deleted string still referenced from manifest. by Eric Fischer · 13 years ago
  2. 951dad2 Restore deleted string still referenced from manifest. by Eric Fischer · 13 years ago
  3. b2c4b38 Merge "Import revised translations." by Eric Fischer · 13 years ago
  4. e2cccc0 Import revised translations. by Eric Fischer · 13 years ago
  5. 2a3f6f1 Fix two incorrect synchronized statements. by mike wakerly · 13 years ago
  6. a29693d am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1 by Martijn Coenen · 13 years ago
  7. 3a67510 Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1 by Martijn Coenen · 13 years ago
  8. 841409b Fix NdefFormatable not showing up for NfcA technologies. by Martijn Coenen · 13 years ago
  9. b65d7ea Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  10. ad62867 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  11. 772130a am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 by Nick Pelly · 13 years ago
  12. e1cadb0 Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 by Nick Pelly · 13 years ago
  13. 37bb7b2 Replace vendor specific NfcGoogle.apk with generic Nfc.apk by Nick Pelly · 13 years ago
  14. ac9b34c Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  15. c171c42 am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1 by Martijn Coenen · 13 years ago
  16. 61b4532 am 078e8368: Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1 by Nick Pelly · 13 years ago
  17. 806a782 Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1 by Martijn Coenen · 13 years ago
  18. 483f306 Also send NFCEE broadcasts to dynamically registered receivers. by Martijn Coenen · 13 years ago
  19. 078e836 Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1 by Nick Pelly · 13 years ago
  20. 23136ec merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  21. fba7c35 am bc6535cc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  22. 602f9b6 am 59137f77: No-op merge from ics-mr0 by The Android Open Source Project · 13 years ago
  23. 4d80c35 Set up DISCOVERY and SE notification callbacks at NFC init. by Nick Pelly · 13 years ago
  24. bc6535c Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  25. e6178c2 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  26. 59137f7 No-op merge from ics-mr0 by The Android Open Source Project · 13 years ago
  27. 5c12d70 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  28. 2a7163a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  29. b5ca7e7 am 2b093e93: Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1 by Nick Pelly · 13 years ago
  30. 2b093e9 Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1 by Nick Pelly · 13 years ago
  31. fc87b42 Enable NFC-EE immediately when screen is on but locked. by mike wakerly · 13 years ago
  32. 574f278 am f4226b69: Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1 by Nick Pelly · 13 years ago
  33. 905cf88 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  34. f4226b6 Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1 by Nick Pelly · 13 years ago
  35. 0571ce5 Add null check to aovid NPE on un-matched close(). by Nick Pelly · 13 years ago
  36. 68dfe2c merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  37. 0d00a83 resolved conflicts for merge of ebf4b36e to master by Nick Pelly · 13 years ago
  38. 1d9c95c am d9203771: Optimize soundpool use. by Martijn Coenen · 13 years ago
  39. ebf4b36 Merge "Implement static white-list access control for NFC-EE." into ics-mr1 by Nick Pelly · 13 years ago
  40. d920377 Optimize soundpool use. by Martijn Coenen · 13 years ago
  41. b0928ea Allow EEPROM settings override using properties. by Martijn Coenen · 13 years ago
  42. c05387e Implement static white-list access control for NFC-EE. by Jeff Hamilton · 13 years ago
  43. 07cb451 Merge "Import revised translations." by Eric Fischer · 13 years ago
  44. 0c14e3f Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  45. 4d4713b Import revised translations. by Eric Fischer · 13 years ago
  46. a0e2279 am 133d5fee: (-s ours) am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  47. 1027822 am c1c09483: Reduce sound assets size. by Eric Laurent · 13 years ago
  48. 133d5fe am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  49. 6d470b8 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  50. 88194cf Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  51. c1c0948 Reduce sound assets size. by Eric Laurent · 13 years ago
  52. 81d5e01 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  53. 9408fa0 am d7bca9eb: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  54. d7bca9e Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  55. 086971d Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  56. b28f540 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  57. de189bb am cbc85676: Merge "Get EEPROM settings from NFC HAL." into ics-mr1 by Martijn Coenen · 13 years ago
  58. c9a17f6 am f7a151e2: Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1 by Martijn Coenen · 13 years ago
  59. cbc8567 Merge "Get EEPROM settings from NFC HAL." into ics-mr1 by Martijn Coenen · 13 years ago
  60. f7a151e Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1 by Martijn Coenen · 13 years ago
  61. 7ba4a8a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  62. 5c5ecd9 am a2181682: Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1 by Martijn Coenen · 13 years ago
  63. 9390cc0 am 304a7304: Merge "Don\'t finish Beam animation again." into ics-mr1 by Martijn Coenen · 13 years ago
  64. a218168 Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1 by Martijn Coenen · 13 years ago
  65. 304a730 Merge "Don't finish Beam animation again." into ics-mr1 by Martijn Coenen · 13 years ago
  66. c7f74df Get EEPROM settings from NFC HAL. by Martijn Coenen · 13 years ago
  67. 967f455 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  68. f2ce6fd am 8896c444: Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  69. 8896c44 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  70. d59b331 Remove static background image from Beam when no hw-acceleration. by Martijn Coenen · 13 years ago
  71. e3cfbec Check for navigation bar when cropping Beam screenshot. by Martijn Coenen · 13 years ago
  72. 4e0ab31 Don't finish Beam animation again. by Martijn Coenen · 13 years ago
  73. fe84878 Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0" by The Android Automerger · 13 years ago
  74. 9fee282 merge in ics-factoryrom-2-release history after reset to ics-mr0 by The Android Automerger · 13 years ago
  75. 6619596 am b8e9f010: Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  76. b8e9f01 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  77. bc02dfe am 2d97436c: Merge "Import revised translations." into ics-mr1 by Eric Fischer · 13 years ago
  78. f9a6652 am c374dd0c: (-s ours) am 08956967: Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  79. 948ac84 Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0" by The Android Automerger · 13 years ago
  80. d6db37f merge in ics-factoryrom-2-release history after reset to ics-mr0 by The Android Automerger · 13 years ago
  81. cc56b04 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  82. bdcf141 Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0" by The Android Automerger · 13 years ago
  83. 2d97436 Merge "Import revised translations." into ics-mr1 by Eric Fischer · 13 years ago
  84. 5fa32b0 Import revised translations. by Eric Fischer · 13 years ago
  85. c374dd0 am 08956967: Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  86. 0895696 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  87. a900c62 Merge "Changes semantics of isNdefPushEnabled() - require NFC to be enabled." by Nick Pelly · 13 years ago
  88. 4e6ed14 Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0" by The Android Automerger · 13 years ago
  89. 02ca36a am 06296c3e: (-s ours) am ea499450: Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  90. 9993a5a Changes semantics of isNdefPushEnabled() - require NFC to be enabled. by Nick Pelly · 13 years ago
  91. 5a5981b Fix copyright date, minor comment edit. by Nick Pelly · 13 years ago
  92. 06296c3 am ea499450: Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  93. ea49945 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  94. 9c3163e Revert "Add event logs for NFC events. DO NOT MERGE" by The Android Automerger · 13 years ago
  95. cbad95a merge in ics-factoryrom-2-release history after reset to ics-mr0 by The Android Automerger · 13 years ago
  96. 4ca2fb1 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  97. 4e29084 Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0" by The Android Automerger · 13 years ago
  98. 3f1d8e7 am f5c40bdb: (-s ours) Add event logs for NFC events. DO NOT MERGE by Jeff Hamilton · 13 years ago
  99. 419179a Merge "Edits to strings to use UI text standards (ending punctuation in second notification line, use "Touch" instead of "Tap", use "app" instead of "application". Bug: 5163232" by Claudia de Veaux · 13 years ago
  100. 140acba Edits to strings to use UI text standards by Claudia de Veaux · 13 years ago