1. 371ab90 am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp by Tao Bao · 9 years ago
  2. ea5d8f0 am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." by Tao Bao · 9 years ago
  3. 3fd097f am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." by Tao Bao · 9 years ago
  4. 77de478 am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." by Tao Bao · 9 years ago
  5. 05c4b53 am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." by Tao Bao · 9 years ago
  6. f6bebbd am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." by Tao Bao · 9 years ago
  7. d37f91d am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." by Tao Bao · 9 years ago
  8. c73e18f am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." by Tao Bao · 9 years ago
  9. f075f9a am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." by Tao Bao · 9 years ago
  10. ca66fc1 am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." by Tao Bao · 9 years ago
  11. d33e21a am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." by Tao Bao · 9 years ago
  12. 9da33c6 am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." by Tao Bao · 9 years ago
  13. f0e341b am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" by Tao Bao · 9 years ago
  14. 3ac4765 am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev by Paul Lawrence · 9 years ago
  15. b3f4921 am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" by Tao Bao · 9 years ago
  16. 04d9b85 am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev by Paul Lawrence · 9 years ago
  17. 165c6ad am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." by Tao Bao · 9 years ago
  18. 5a16eba am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." by Tao Bao · 9 years ago
  19. eef9913 Merge "updater: Remove the unused isunresumable in SaveStash()." by Tao Bao · 9 years ago
  20. 1a3ccc8 am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" by Tao Bao · 9 years ago
  21. 9739a29 updater: Remove the unused isunresumable in SaveStash(). by Tao Bao · 9 years ago
  22. dc61d17 am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" by Tao Bao · 9 years ago
  23. 50c17f9 Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" by Tao Bao · 9 years ago
  24. ba78158 am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery. by Tao Bao · 9 years ago
  25. 337db14 recovery: Factor out wear_ui.{cpp,h} into bootable/recovery. by Tao Bao · 9 years ago
  26. a6153df GOOGLEGMS-749 Fix integer overflow while applying block based OTA package by Shrinivas Sahukar · 9 years ago
  27. f0355ae am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++." by Tao Bao · 9 years ago
  28. dbbdcf3 am 93fa4b67: Merge "edify: Switch to C++." by Tao Bao · 9 years ago
  29. 93fa4b6 Merge "edify: Switch to C++." by Tao Bao · 9 years ago
  30. 2a5a49d edify: Switch to C++. by Tao Bao · 9 years ago
  31. e57ca0e am 4854e292: am ad509fd4: Merge "Fix potential crash" by Tao Bao · 9 years ago
  32. 4854e29 am ad509fd4: Merge "Fix potential crash" by Tao Bao · 9 years ago
  33. ad509fd Merge "Fix potential crash" by Tao Bao · 9 years ago
  34. 0d42440 am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." by Tao Bao · 9 years ago
  35. 36ca380 am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." by Tao Bao · 9 years ago
  36. 434a176 am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." by Tao Bao · 9 years ago
  37. 7f89389 am 7c511184: Merge "updater: Clean up char* with std::string." by Tao Bao · 9 years ago
  38. 0d46c7a Merge "Use unique_ptr and unique_fd to manager FDs." by Tao Bao · 9 years ago
  39. 7c51118 Merge "updater: Clean up char* with std::string." by Tao Bao · 9 years ago
  40. c754792 Use unique_ptr and unique_fd to manager FDs. by Tao Bao · 9 years ago
  41. f2a23a9 am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." by Dan Albert · 9 years ago
  42. 236b3eb am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." by Dan Albert · 9 years ago
  43. e67104a Merge "Use CPPFLAGS instead of CFLAGS." by Dan Albert · 9 years ago
  44. b02e90f Use CPPFLAGS instead of CFLAGS. by Dan Albert · 9 years ago
  45. 2496489 am a9390df6: am 06689dc5: Merge "Fix recovery image build." by Elliott Hughes · 9 years ago
  46. a9390df am 06689dc5: Merge "Fix recovery image build." by Elliott Hughes · 9 years ago
  47. 06689dc Merge "Fix recovery image build." by Elliott Hughes · 9 years ago
  48. faa7500 Fix recovery image build. by Elliott Hughes · 9 years ago
  49. e6aa332 updater: Clean up char* with std::string. by Tao Bao · 9 years ago
  50. 1b7d9b7 Fix potential crash by Jeremy Compostella · 9 years ago
  51. 68e7743 resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp by Tao Bao · 9 years ago
  52. 7daa48e resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp by Tao Bao · 9 years ago
  53. 5aa3ce3 am be19dce8: udpater: Call fsync() after rename(). by Tao Bao · 9 years ago
  54. 0e2efab am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." by Tao Bao · 9 years ago
  55. ddbfdf7 am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." by Tao Bao · 9 years ago
  56. 393d1e7 am 27c1ab20: Merge "udpater: Call fsync() after rename()." by Tao Bao · 9 years ago
  57. be19dce udpater: Call fsync() after rename(). by Tao Bao · 9 years ago
  58. 27c1ab2 Merge "udpater: Call fsync() after rename()." by Tao Bao · 9 years ago
  59. dc39226 udpater: Call fsync() after rename(). by Tao Bao · 9 years ago
  60. 414c576 am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." by Tao Bao · 9 years ago
  61. 854ae7f am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." by Tao Bao · 9 years ago
  62. 2e979ef am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." by Tao Bao · 9 years ago
  63. 302779e Merge "recovery: Allow "Mount /system" for system_root_image." by Tao Bao · 9 years ago
  64. abb8f77 recovery: Allow "Mount /system" for system_root_image. by Tao Bao · 9 years ago
  65. 7d71725 am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." by Tao Bao · 9 years ago
  66. f3f2799 am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." by Tao Bao · 9 years ago
  67. 7666f65 am 62e19231: Merge "updater: Hoist fsync() to outer loop." by Tao Bao · 9 years ago
  68. 62e1923 Merge "updater: Hoist fsync() to outer loop." by Tao Bao · 9 years ago
  69. 187efff updater: Hoist fsync() to outer loop. by Tao Bao · 9 years ago
  70. 4b3ad00 am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." by Tao Bao · 9 years ago
  71. cb0e7f2 am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." by Tao Bao · 9 years ago
  72. 0622ccb am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." by Tao Bao · 9 years ago
  73. 6a4a33e Merge "applypatch: Fix the checking in WriteToPartition()." by Tao Bao · 9 years ago
  74. 1ce7a2a applypatch: Fix the checking in WriteToPartition(). by Tao Bao · 9 years ago
  75. 6a06034 am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." by Tao Bao · 9 years ago
  76. 3318523 am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." by Tao Bao · 9 years ago
  77. f0654b4 am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." by Tao Bao · 9 years ago
  78. 7665d44 am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." by Tao Bao · 9 years ago
  79. 5040636 am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." by Tao Bao · 9 years ago
  80. 596219d am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." by Tao Bao · 9 years ago
  81. 3b753ad am dd738c11: Merge "applypatch: Support flash mode." by Tao Bao · 9 years ago
  82. e657f0f am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." by Tao Bao · 9 years ago
  83. 3f64062 am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." by Tao Bao · 9 years ago
  84. 49a2446 am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." by Tao Bao · 9 years ago
  85. 052796e am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." by Tao Bao · 9 years ago
  86. 0d4e002 recovery: Switch fuse_* to C++. by Tao Bao · 9 years ago
  87. c69095d am afb8f320: Merge "uncrypt: Support file level encryption." by Tao Bao · 9 years ago
  88. 87f2c67 am cc3c3414: Merge "updater: libapplypatch needs libbase now." by Tao Bao · 9 years ago
  89. 1dc71be am cfd9d9c7: Merge "applypatch: Refactor strtok()." by Tao Bao · 9 years ago
  90. dd738c1 Merge "applypatch: Support flash mode." by Tao Bao · 9 years ago
  91. abba55b applypatch: Support flash mode. by Tao Bao · 9 years ago
  92. afb8f32 Merge "uncrypt: Support file level encryption." by Tao Bao · 9 years ago
  93. 7cf50c6 uncrypt: Support file level encryption. by Tao Bao · 9 years ago
  94. cc3c341 Merge "updater: libapplypatch needs libbase now." by Tao Bao · 9 years ago
  95. ba8a678 updater: libapplypatch needs libbase now. by Tao Bao · 9 years ago
  96. cfd9d9c Merge "applypatch: Refactor strtok()." by Tao Bao · 9 years ago
  97. aca8e89 applypatch: Refactor strtok(). by Tao Bao · 9 years ago
  98. b91e700 am 85090d0c: Merge "recovery: Switch fuse_* to C++." by Tao Bao · 9 years ago
  99. 85090d0c Merge "recovery: Switch fuse_* to C++." by Tao Bao · 9 years ago
  100. 71dc365 recovery: Switch fuse_* to C++. by Tao Bao · 9 years ago