1. efc56ea Add back.png to the Nfc app's drawable-mdpi by Jason Simmons · 13 years ago
  2. fb21ff7 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  3. 0f4381f am d2d440a3: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  4. a907d6f Add event logs for NFC events. DO NOT MERGE by Jeff Hamilton · 13 years ago
  5. 131f8e5 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  6. ec8c538 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  7. d2d440a Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  8. 48236b0 undo reset to ics-mr1 until we have a better method by Ed Heyl · 13 years ago
  9. 1c7691c reset to ics-mr1, but keep history by Ed Heyl · 13 years ago
  10. da570cf am de82f607: (-s ours) am 628d629a: (-s ours) Merge "DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7." into ics-mr0 by Nick Pelly · 13 years ago
  11. de82f60 am 628d629a: (-s ours) Merge "DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7." into ics-mr0 by Nick Pelly · 13 years ago
  12. 628d629 Merge "DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7." into ics-mr0 by Nick Pelly · 13 years ago
  13. 2f73857 DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7. by Martijn Coenen · 13 years ago
  14. 7069391 am 93c036ab: am 7f0fcbb2: Merge "EEPROM values for NFC FW 109.11" into ics-mr1 by Nick Pelly · 13 years ago
  15. 93c036a am 7f0fcbb2: Merge "EEPROM values for NFC FW 109.11" into ics-mr1 by Nick Pelly · 13 years ago
  16. 7f0fcbb Merge "EEPROM values for NFC FW 109.11" into ics-mr1 by Nick Pelly · 13 years ago
  17. c610f84 am e64c8c3b: Merge "Add event logs for NFC events." by Jeff Hamilton · 13 years ago
  18. e64c8c3 Merge "Add event logs for NFC events." by Jeff Hamilton · 13 years ago
  19. 30afdbe merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  20. f8aa5bf am 3d027ac3: am dc483c85: Merge "Write NFC EEPROM setting for lower-power poll measurements to default." into ics-mr1 by Martijn Coenen · 13 years ago
  21. 3d027ac am dc483c85: Merge "Write NFC EEPROM setting for lower-power poll measurements to default." into ics-mr1 by Martijn Coenen · 13 years ago
  22. dc483c8 Merge "Write NFC EEPROM setting for lower-power poll measurements to default." into ics-mr1 by Martijn Coenen · 13 years ago
  23. e047046 am 22f1027f: am ff2edbf0: Merge remote branch \'goog/ics-mr0\' into ics-mr1 by Ed Heyl · 13 years ago
  24. 22f1027 am ff2edbf0: Merge remote branch \'goog/ics-mr0\' into ics-mr1 by Ed Heyl · 13 years ago
  25. e0b20aa merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  26. c839a31 EEPROM values for NFC FW 109.11 by Martijn Coenen · 13 years ago
  27. 0bf337e Write NFC EEPROM setting for lower-power poll measurements to default. by Martijn Coenen · 13 years ago
  28. 416e2fc Add event logs for NFC events. by Jeff Hamilton · 13 years ago
  29. ff2edbf Merge remote branch 'goog/ics-mr0' into ics-mr1 by Ed Heyl · 13 years ago
  30. a94ff17 am 96fec5b5: Merge "Import revised translations." by Eric Fischer · 13 years ago
  31. 96fec5b Merge "Import revised translations." by Eric Fischer · 13 years ago
  32. 6b8a8f7 Import revised translations. by Eric Fischer · 13 years ago
  33. a617e5c am d8e67563: (-s ours) am 3020597c: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  34. d8e6756 am 3020597c: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  35. 3020597 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  36. b003979 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  37. 537da41 am f5ac7837: am 94dc4266: Merge "NFC: Enable guard host timeout." into ics-mr0 by Martijn Coenen · 13 years ago
  38. f5ac783 am 94dc4266: Merge "NFC: Enable guard host timeout." into ics-mr0 by Martijn Coenen · 13 years ago
  39. 94dc426 Merge "NFC: Enable guard host timeout." into ics-mr0 by Martijn Coenen · 13 years ago
  40. 56f2a7b NFC: Enable guard host timeout. by Martijn Coenen · 13 years ago
  41. ae698dc am 2ab89f6e: am 51c44537: Merge "Start all NFC activities from a dedicated root task." into ics-mr0 by Martijn Coenen · 13 years ago
  42. 2ab89f6 am 51c44537: Merge "Start all NFC activities from a dedicated root task." into ics-mr0 by Martijn Coenen · 13 years ago
  43. 51c4453 Merge "Start all NFC activities from a dedicated root task." into ics-mr0 by Martijn Coenen · 13 years ago
  44. 5f2ad69 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  45. af4978e am 9a8cbd14: am 7bbabb2d: Fix crash when turning screen off and NFC is off. by Martijn Coenen · 13 years ago
  46. 9a8cbd1 am 7bbabb2d: Fix crash when turning screen off and NFC is off. by Martijn Coenen · 13 years ago
  47. 7bbabb2 Fix crash when turning screen off and NFC is off. by Martijn Coenen · 13 years ago
  48. d50abc4 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  49. 64832a4 am 0bca9a1c: Merge "Import revised translations." by Eric Fischer · 13 years ago
  50. 0bca9a1 Merge "Import revised translations." by Eric Fischer · 13 years ago
  51. 6bebb39 Import revised translations. by Eric Fischer · 13 years ago
  52. 1e592d4 am cc59be4a: (-s ours) am 68f53c55: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  53. cc59be4 am 68f53c55: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  54. 68f53c5 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  55. 3819e94 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  56. f955ec0 Start all NFC activities from a dedicated root task. by Martijn Coenen · 13 years ago
  57. 43495ae am e0b5fcb7: Make the crash on screen off less frequent. by Jeff Hamilton · 13 years ago
  58. e0b5fcb Make the crash on screen off less frequent. by Jeff Hamilton · 13 years ago
  59. ce2b0b1 am 4dd3c020: Final NFC animation tweaks. by Martijn Coenen · 13 years ago
  60. 4dd3c02 Final NFC animation tweaks. by Martijn Coenen · 13 years ago
  61. ac996b4 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  62. 6eabea4 am 90e1b000: NFC: Remove statusbar/navbar from animated screenshot. by Martijn Coenen · 13 years ago
  63. 66e82b6 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  64. 90e1b00 NFC: Remove statusbar/navbar from animated screenshot. by Martijn Coenen · 13 years ago
  65. e4c49de am e59ab8f4: NFC: enable low-power RF polling feature. by Martijn Coenen · 13 years ago
  66. e59ab8f NFC: enable low-power RF polling feature. by Martijn Coenen · 13 years ago
  67. 1d56ced merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  68. c682558 am 96431890: Merge "Import revised translations." by Eric Fischer · 13 years ago
  69. 9643189 Merge "Import revised translations." by Eric Fischer · 13 years ago
  70. 8e6b04a am 707b268c: Merge "NFC screenshot animation adjustments: - eliminate discontinuous jump when starting failure animation (mScaleUpAnimator) - simplify success animation: fade live app in at scale=1, rather than scaling it back up - minor timing and motion curve tweaks by Brandon Keely · 13 years ago
  71. 950cb42 am ff427045: Updated FireflyRenderThread to be more subtle and depthy. by Brandon Keely · 13 years ago
  72. 707b268 Merge "NFC screenshot animation adjustments: - eliminate discontinuous jump when starting failure animation (mScaleUpAnimator) - simplify success animation: fade live app in at scale=1, rather than scaling it back up - minor timing and motion curve tweaks" by Brandon Keely · 13 years ago
  73. 4c4f149 Import revised translations. by Eric Fischer · 13 years ago
  74. 674cd01 NFC screenshot animation adjustments: by Brandon Keely · 13 years ago
  75. ff42704 Updated FireflyRenderThread to be more subtle and depthy. by Brandon Keely · 13 years ago
  76. 5c06d83 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  77. dfa9e85 am d923e242: Merge "Import revised translations." by Eric Fischer · 13 years ago
  78. d923e24 Merge "Import revised translations." by Eric Fischer · 13 years ago
  79. 9e8b58c Import revised translations. by Eric Fischer · 13 years ago
  80. 4edc2a4 am 50effe46: Add DUMP permissions check by Kenny Root · 13 years ago
  81. 50effe4 Add DUMP permissions check by Kenny Root · 13 years ago
  82. 45e0db2 merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  83. 10eeadc am 45d7fa11: (-s ours) am 732f77cf: (-s ours) Import revised translations. DO NOT MERGE. by Eric Fischer · 13 years ago
  84. 45d7fa1 am 732f77cf: (-s ours) Import revised translations. DO NOT MERGE. by Eric Fischer · 13 years ago
  85. 732f77c Import revised translations. DO NOT MERGE. by Eric Fischer · 13 years ago
  86. 64e872c am 8e85fe44: NfcService: call enableAppSwitches for additional events. by mike wakerly · 13 years ago
  87. 8e85fe4 NfcService: call enableAppSwitches for additional events. by mike wakerly · 13 years ago
  88. 41abf5c am a92d7b39: (-s ours) am 416d5ff3: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  89. a92d7b3 am 416d5ff3: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  90. 416d5ff Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  91. 8f368cd merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  92. 222034c am 5659b5b5: (-s ours) am c625b19e: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  93. 5659b5b am c625b19e: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  94. c625b19 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  95. 31b1f62 am 34bcd35f: Merge "Fix NFC to only be enabled when the lockscreen is dismissed." by Jeff Hamilton · 13 years ago
  96. 34bcd35 Merge "Fix NFC to only be enabled when the lockscreen is dismissed." by Jeff Hamilton · 13 years ago
  97. 36a1e42 Fix NFC to only be enabled when the lockscreen is dismissed. by Jeff Hamilton · 13 years ago
  98. d2ae95e merge in ics-release history after reset to master by The Android Automerger · 13 years ago
  99. abfbb8c am e65e8588: (-s ours) am 01400378: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  100. e65e858 am 01400378: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago