1. 87f49b8 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc by Tianjie Xu · 8 years ago
  2. 99e38bf DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 by Tianjie Xu · 8 years ago
  3. 8e26787 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 by Tianjie Xu · 8 years ago
  4. 3d1f19c DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours by Tianjie Xu · 8 years ago
  5. 510b13a DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 by Tianjie Xu · 8 years ago
  6. 0a627e5 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 by Tianjie Xu · 8 years ago
  7. 9930b28 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c by Tianjie Xu · 8 years ago
  8. d1c3bdd DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours by Tianjie Xu · 8 years ago
  9. 457ad2d DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a by Tianjie Xu · 8 years ago
  10. 0d750f9 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours by Tianjie Xu · 8 years ago
  11. 8bdb13d DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours by Tianjie Xu · 8 years ago
  12. 3591cb4 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev by Tianjie Xu · 8 years ago
  13. 4eb997d DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev by Tianjie Xu · 8 years ago
  14. f859652 Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 by Sen Jiang · 8 years ago
  15. 9bb0819 Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 by Sen Jiang · 8 years ago
  16. 37bda6a Merge "imgdiff: cache bsdiff suffix array in zip mode." by Sen Jiang · 8 years ago
  17. 18098b7 Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 by Tianjie Xu · 8 years ago
  18. a38224e Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 by Tianjie Xu · 8 years ago
  19. 69e73ab Merge "Add checkers and tests for empty locale in PNG file" by Tianjie Xu · 8 years ago
  20. de53047 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 by Tianjie Xu · 8 years ago
  21. d0bfa33 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 by Tianjie Xu · 8 years ago
  22. 8953f91 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 by Tianjie Xu · 8 years ago
  23. 8f9e3c9 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours by Tianjie Xu · 8 years ago
  24. 67b69c0 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 by Tianjie Xu · 8 years ago
  25. 8a51334 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a by Tianjie Xu · 8 years ago
  26. b21b92b DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 by Tianjie Xu · 8 years ago
  27. ddca75f DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours by Tianjie Xu · 8 years ago
  28. 37a5941 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 by Tianjie Xu · 8 years ago
  29. 2b1bcab DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours by Tianjie Xu · 8 years ago
  30. 94c8b5e DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours by Tianjie Xu · 8 years ago
  31. 051dfa7 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours by Tianjie Xu · 8 years ago
  32. a41cc29 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 by Tianjie Xu · 8 years ago
  33. d17a688 Add checkers and tests for empty locale in PNG file by Tianjie Xu · 8 years ago
  34. 930edb6 imgdiff: cache bsdiff suffix array in zip mode. by Sen Jiang · 8 years ago
  35. 97ea844 resolve build error when merging 0f7f7e21 by Tianjie Xu · 8 years ago
  36. 8a45adb Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 by Tianjie Xu · 8 years ago
  37. e0d3b0c Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 by Tianjie Xu · 8 years ago
  38. e4ec60e Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a by Tianjie Xu · 8 years ago
  39. 64f0de7 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 by Tianjie Xu · 8 years ago
  40. ca50d7b Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 by Tianjie Xu · 8 years ago
  41. 15ca2a4 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 by Tianjie Xu · 8 years ago
  42. a055eb9 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 by Tianjie Xu · 8 years ago
  43. 6ea9888 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d by Tianjie Xu · 8 years ago
  44. d3d5e54 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b by Tianjie Xu · 8 years ago
  45. fb80b4f Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b by Tianjie Xu · 8 years ago
  46. 0a34b17 Add a checker for signature boundary in verifier am: 54ea136fde by Tianjie Xu · 8 years ago
  47. 5346da0 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 by Tianjie Xu · 8 years ago
  48. 54890af Merge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 by Tao Bao · 8 years ago
  49. ad20b76 Merge "minui: Export minui/minui.h." am: 13d15af08f by Tao Bao · 8 years ago
  50. 13d15af Merge "minui: Export minui/minui.h." by Tao Bao · 8 years ago
  51. 0ecbd76 minui: Export minui/minui.h. by Tao Bao · 8 years ago
  52. 81bffbd Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 by Tao Bao · 8 years ago
  53. 421d927 Merge "recovery: Move property_get() to android::base::GetProperty()." by Tao Bao · 8 years ago
  54. ebb4e96 Merge "recovery: Move property_get() to android::base::GetProperty()." by Tao Bao · 8 years ago
  55. e05674f Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 by Tianjie Xu · 8 years ago
  56. 19e4f62 Merge "Update background text images in recovery" am: f0af02fea6 by Tianjie Xu · 8 years ago
  57. f0af02f Merge "Update background text images in recovery" by Tianjie Xu · 8 years ago
  58. efc3559 recovery: Move property_get() to android::base::GetProperty(). by Tao Bao · 8 years ago
  59. a1e336d Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 by Alex Deymo · 8 years ago
  60. 9e93a79 Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a by Alex Deymo · 8 years ago
  61. 9edd655 Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 by Alex Deymo · 8 years ago
  62. f8f1a25 Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb by Alex Deymo · 8 years ago
  63. 204369e Remove "_static" suffix from libsparse am: 67f3aa8804 by Alex Deymo · 8 years ago
  64. 4b54093 Remove "_static" suffix from libext4_utils. am: 31653660ad by Alex Deymo · 8 years ago
  65. 8031c2d Merge changes from topic 'host_suffix_cleanup' by Alex Deymo · 8 years ago
  66. 67f3aa8 Remove "_static" suffix from libsparse by Alex Deymo · 8 years ago
  67. 3165366 Remove "_static" suffix from libext4_utils. by Alex Deymo · 8 years ago
  68. 7d345f2 Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 by Tianjie Xu · 8 years ago
  69. 854ef3b Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 by Tianjie Xu · 8 years ago
  70. 37d74f3 Merge "Do not inject I/O fault on a retry" by Tianjie Xu · 8 years ago
  71. ac43194 Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda by Elliott Hughes · 8 years ago
  72. 3e003ce Merge "Address review comment." am: 77ec0071cf by Elliott Hughes · 8 years ago
  73. 77ec007 Merge "Address review comment." by Elliott Hughes · 8 years ago
  74. 4728242 Do not inject I/O fault on a retry by Tianjie Xu · 8 years ago
  75. 6ac5db2 Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 by Elliott Hughes · 8 years ago
  76. 61728ff Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 by Elliott Hughes · 8 years ago
  77. ff8fdc9 Address review comment. by Elliott Hughes · 8 years ago
  78. 2fc1ff3 Merge "Move to .md files for even trivial documentation." by Elliott Hughes · 8 years ago
  79. b7ce9c5 Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c by Tao Bao · 8 years ago
  80. fe0a801 Merge "recovery: Fix the argument parsing." am: 33808f16c5 by Tao Bao · 8 years ago
  81. 33808f1 Merge "recovery: Fix the argument parsing." by Tao Bao · 8 years ago
  82. 570af9d recovery: Fix the argument parsing. by Tao Bao · 8 years ago
  83. 7a890e5 Move to .md files for even trivial documentation. by Elliott Hughes · 8 years ago
  84. 5ec7585 Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 by Tianjie Xu · 8 years ago
  85. 06b4254 Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 by Tianjie Xu · 8 years ago
  86. ceafe69 Merge "Retry ioctl in uncrypt if it returns block# 0" by Tianjie Xu · 8 years ago
  87. a78b2d2 Update background text images in recovery by Tianjie Xu · 8 years ago
  88. af53db6 Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb by Tao Bao · 8 years ago
  89. 1bbd9c6 Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb by Tao Bao · 8 years ago
  90. 095675a Merge "recovery: Clean up try_update_binary() in install.cpp." by Treehugger Robot · 8 years ago
  91. ba0dad8 Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 by Tao Bao · 8 years ago
  92. 179fc8a Merge "tests: Add testcase for show_progress() and set_progress()." by Tao Bao · 8 years ago
  93. 478a5ec Merge "tests: Add testcase for show_progress() and set_progress()." by Tao Bao · 8 years ago
  94. 20c581e recovery: Clean up try_update_binary() in install.cpp. by Tao Bao · 8 years ago
  95. 9aa7ab5 tests: Add testcase for show_progress() and set_progress(). by Tao Bao · 8 years ago
  96. fbb5dbb Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 by Tao Bao · 8 years ago
  97. 719a15b Merge "updater: Clean up CreateStash()." am: 91f74c82cd by Tao Bao · 8 years ago
  98. 91f74c8 Merge "updater: Clean up CreateStash()." by Tao Bao · 8 years ago
  99. e513c0f Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b by Tao Bao · 8 years ago
  100. 4d37763 Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b by Tao Bao · 8 years ago