1. 8e7a862 resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp am: 64f46fb16c by Tianjie Xu · 8 years ago
  2. 3295d19 resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp am: 64f46fb16c by Tianjie Xu · 8 years ago
  3. cf5c1bc resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp am: 894176632c by Tianjie Xu · 8 years ago
  4. 8941766 resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp by Tianjie Xu · 8 years ago
  5. f02e799 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp am: ba33da2884 by Tao Bao · 8 years ago
  6. 8dc1909 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp am: ba33da2884 by Tao Bao · 8 years ago
  7. 64f46fb resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp by Tianjie Xu · 8 years ago
  8. 57ad046 Call ioctl before each write on retry am: 7ce287d432 by Tianjie Xu · 8 years ago
  9. ba33da2 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp by Tao Bao · 8 years ago
  10. fe8e356 Merge "recovery: Add support to brick a device." am: 0ab866b354 by Tao Bao · 8 years ago
  11. b083818 recovery: Add support to brick a device. by Tao Bao · 8 years ago
  12. 0ab866b Merge "recovery: Add support to brick a device." by Tao Bao · 8 years ago
  13. 7ce287d Call ioctl before each write on retry by Tianjie Xu · 8 years ago
  14. 862a4c1 recovery: Add support to brick a device. by Tao Bao · 8 years ago
  15. a3b8ce8 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d am: e13a690c16 by Tao Bao · 8 years ago
  16. 68fe0be Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d by Tao Bao · 8 years ago
  17. e13a690 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 by Tao Bao · 8 years ago
  18. a7fca94 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" by Tao Bao · 8 years ago
  19. 2dbd0f4 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" by Tao Bao · 8 years ago
  20. 65f98cb Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." by Tao Bao · 8 years ago
  21. c96c988 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" by Tao Bao · 8 years ago
  22. a0c4011 Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." by Tao Bao · 8 years ago
  23. 8668045 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 am: 23bb1d210d by Adam Buchbinder · 8 years ago
  24. 150c500 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 by Adam Buchbinder · 8 years ago
  25. 23bb1d2 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 by Adam Buchbinder · 8 years ago
  26. 11c794b Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." by Adam Buchbinder · 8 years ago
  27. a885071 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." by Treehugger Robot · 8 years ago
  28. 50a6f8c Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. by Adam Buchbinder · 8 years ago
  29. 2df6545 Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf am: d8a518d711 by Tao Bao · 8 years ago
  30. 50b793e Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf by Tao Bao · 8 years ago
  31. d8a518d Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb by Tao Bao · 8 years ago
  32. fd49adb Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb by Tao Bao · 8 years ago
  33. 5920351 Merge "Revert "imgdiff: Generate statically linked imgdiff."" by Tao Bao · 8 years ago
  34. 16e3861 Revert "imgdiff: Generate statically linked imgdiff." by Tao Bao · 8 years ago
  35. 64a59cd Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 am: f90090d429 by Tao Bao · 8 years ago
  36. 197e4af Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 by Tao Bao · 8 years ago
  37. f90090d Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc by Tao Bao · 8 years ago
  38. a83b798 Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc by Tao Bao · 8 years ago
  39. 680d783 Merge "imgdiff: Generate statically linked imgdiff." by Tao Bao · 8 years ago
  40. b4422bd imgdiff: Generate statically linked imgdiff. by Tao Bao · 8 years ago
  41. 51dc944 Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. by Adam Buchbinder · 8 years ago
  42. b9e547e Move force_rgb_565 up. by Aaron Kling · 8 years ago
  43. 08e5801 Disable the meaningless parts of the UI for A/B. am: 01fcbe160b am: 994bacf549 by Elliott Hughes · 8 years ago
  44. 994bacf Disable the meaningless parts of the UI for A/B. am: 01fcbe160b by Elliott Hughes · 8 years ago
  45. f289656 merge in nyc-release history after reset to nyc-dev by The Android Automerger · 8 years ago
  46. 918add2 resolve merge conflicts of 50f6417 am: 3f6eb86390 am: f51e507fa7 by Tianjie Xu · 8 years ago
  47. be04a5e Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 am: f5e2831bf3 by Jeremy Compostella · 8 years ago
  48. 9bedd1a resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp am: 79c13cee26 by Tianjie Xu · 8 years ago
  49. f51e507 resolve merge conflicts of 50f6417 am: 3f6eb86390 by Tianjie Xu · 8 years ago
  50. 1afd591 Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 by Jeremy Compostella · 8 years ago
  51. 79c13ce resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp by Tianjie Xu · 8 years ago
  52. 01fcbe1 Disable the meaningless parts of the UI for A/B. by Elliott Hughes · 8 years ago
  53. 3f6eb86 resolve merge conflicts of 50f6417 by Tianjie Xu · 8 years ago
  54. 8a43084 resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp am: 549745cc87 by Tianjie Xu · 8 years ago
  55. f5e2831 Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 by Jeremy Compostella · 8 years ago
  56. 1ae2434 Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c by Jeremy Compostella · 8 years ago
  57. 3788001 Merge "slot_metadata: add verity_corrupted field" by Treehugger Robot · 8 years ago
  58. 549745c resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp by Tianjie Xu · 8 years ago
  59. 84478e8 resolve merge conflicts of 50f6417 to nyc-dev-plus-aosp by Tianjie Xu · 8 years ago
  60. 3aabd77 Merge "Allow recovery to return error codes" into nyc-dev am: 50f6417317 by Tianjie Xu · 8 years ago
  61. 50f6417 Merge "Allow recovery to return error codes" into nyc-dev by Tianjie Xu · 8 years ago
  62. e77a68f slot_metadata: add verity_corrupted field by Jeremy Compostella · 8 years ago
  63. 1625583 Allow recovery to return error codes by Tianjie Xu · 9 years ago
  64. c466c70 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: bd43d7e92b by Matt Sarett · 9 years ago
  65. cfb45bd resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: 8a55c65345 by Matt Sarett · 9 years ago
  66. 9ca6bac resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a by Matt Sarett · 9 years ago
  67. b898481 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a by Matt Sarett · 9 years ago
  68. 8a55c65 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 by Matt Sarett · 9 years ago
  69. bd43d7e resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 by Matt Sarett · 9 years ago
  70. 75dea9c resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 by Matt Sarett · 9 years ago
  71. b02b2fe resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d by Matt Sarett · 9 years ago
  72. fc1d9a4 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 by Matt Sarett · 9 years ago
  73. 300af07 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad by Matt Sarett · 9 years ago
  74. aa02888 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 by Matt Sarett · 9 years ago
  75. 8a1d4e9 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 by Matt Sarett · 9 years ago
  76. ca45737 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e by Matt Sarett · 9 years ago
  77. 1f814d7 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f by Matt Sarett · 9 years ago
  78. 36acff7 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f by Matt Sarett · 9 years ago
  79. a5bc596 resolve merge conflicts of 86a28d0 to klp-modular-dev by Matt Sarett · 9 years ago
  80. 86a28d0 DO NOT MERGE Use updated libpng API am: 839b4e592a by Matt Sarett · 9 years ago
  81. fcbd6ea merge in nyc-release history after reset to nyc-dev by The Android Automerger · 9 years ago
  82. ccf1b95 Add time and I/O info to last_install am: dd874b1c87 am: 142b864ba1 by Tianjie Xu · 9 years ago
  83. 0f85209 Add time and I/O info to last_install am: dd874b1c87 am: 027b403e8a by Tianjie Xu · 9 years ago
  84. 46aa591 Add time and I/O info to last_install am: dd874b1c87 am: 142b864ba1 by Tianjie Xu · 9 years ago
  85. fb5d7f6 Add time and I/O info to last_install am: dd874b1c87 am: 027b403e8a by Tianjie Xu · 9 years ago
  86. 142b864 Add time and I/O info to last_install am: dd874b1c87 by Tianjie Xu · 9 years ago
  87. 027b403 Add time and I/O info to last_install am: dd874b1c87 by Tianjie Xu · 9 years ago
  88. 839b4e5 DO NOT MERGE Use updated libpng API by Matt Sarett · 9 years ago
  89. 35df638 crypto: remove redundant convert_key_to_hex_ascii call by Captain Throwback · 9 years ago
  90. dd874b1 Add time and I/O info to last_install by Tianjie Xu · 9 years ago
  91. 027c133 Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 am: 0cc7e28ffd by Jonathan Hamilton · 9 years ago
  92. 856ba94 Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 by Jonathan Hamilton · 9 years ago
  93. 0cc7e28 Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 by Jonathan Hamilton · 9 years ago
  94. 32c2e78 Merge "Keep ADF device alive for the lifetime of the minui backend" by Jonathan Hamilton · 9 years ago
  95. 1435249 Merge "Keep ADF device alive for the lifetime of the minui backend" by Treehugger Robot · 9 years ago
  96. d654c35 Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 am: eef053fda1 by Tao Bao · 9 years ago
  97. aec86d3 Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 by Alistair Strachan · 9 years ago
  98. eef053f Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 by Tao Bao · 9 years ago
  99. d03ee52 Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 by Alistair Strachan · 9 years ago
  100. c7d7eb2 Merge "updater, minzip: Remove unnecessary O_SYNC flags." by Tao Bao · 9 years ago